From 1dd0d41b9cb8771be147233186f61db59b400d91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jun 2024 06:59:21 +0000 Subject: [PATCH 01/31] kubevirt: 1.2.1 -> 1.2.2 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index 53c280206843..56d2b4276ae5 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-N7To46D8a64/fVDHOuRWt8xQduh/Lvi5C3/N9FhujmI="; + hash = "sha256-W31B803XTdJ7ExeIwsTAac7RyAX7TZI3UKLURkotjBI="; }; vendorHash = null; From 02c5e9e601ee67959a8e4f52f83746f96843fa8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jun 2024 15:39:10 +0000 Subject: [PATCH 02/31] kuttl: 0.16.0 -> 0.17.0 --- pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 3e5b25a16faa..c36bab57344f 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.16.0"; + version = "0.17.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8="; + sha256 = "sha256-jU/w4SA6gt2xCdJiSNkY2S2RQCuyj84IW1w8DDPvtW0="; }; - vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww="; + vendorHash = "sha256-OXmT7GTnD/TKjCN4po3vLJ0pZgsEEUGnuF5RtOm00hM="; subPackages = [ "cmd/kubectl-kuttl" ]; From 44efd4f673f844b83d9585be8fbee1654e0031c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 03:36:04 +0000 Subject: [PATCH 03/31] xfe: 1.46.1 -> 1.46.2 --- pkgs/applications/file-managers/xfe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 3853119126d1..7b5c4340edd6 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-NTpowZCl4OTWrK2txh7f7t9WxGRdfM0M3KIyHq3nJUg="; + sha256 = "sha256-6hNNda4BKCY9E02uFYJnt0JySNp/is1ZqjFlOwQcRWs="; }; nativeBuildInputs = [ pkg-config intltool ]; From 2f5918d558deb806c23a6aa3521f79183bd4da6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 03:53:51 +0000 Subject: [PATCH 04/31] praat: 6.4.12 -> 6.4.13 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 39d258c806c7..fb27f769f897 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.12"; + version = "6.4.13"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-nriw/nP73m27QWdhC5ooTuVMul+GdOUsnVroM/CZiiY="; + hash = "sha256-rvaW4ifXZNAmON+2OZR2JLGPzaTEzk2miKeFHQ7Bp6M="; }; nativeBuildInputs = [ From bb0baa0ab3e5a38b90971038f45617a287d972b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 08:16:12 +0000 Subject: [PATCH 05/31] alglib: 4.01.0 -> 4.02.0 --- pkgs/development/libraries/alglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/development/libraries/alglib/default.nix index b2e13cdc0665..1bd2ad6fe3e1 100644 --- a/pkgs/development/libraries/alglib/default.nix +++ b/pkgs/development/libraries/alglib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alglib3"; - version = "4.01.0"; + version = "4.02.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "sha256-lejqQbMskjRvSaaUdZ54bF86EIe0AaklnvWSwO6kvvs="; + sha256 = "sha256-U7/ukBXdwC8GkpevFfSfbgbiyOf7CkDv0PUAL8BnAag="; }; nativeBuildInputs = [ From aac47c9a7fbddbc542b21745d15633be33d4b4c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 15:24:24 +0000 Subject: [PATCH 06/31] kubecm: 0.29.1 -> 0.30.0 --- pkgs/applications/networking/cluster/kubecm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index ffbb8a4cc83c..b1e36dee59c0 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-Lz7mCbEEiCmNPmJ8RkxJLEOOdyvLZl3pT3qL2/kHYuA="; + hash = "sha256-zyXxMp+59buSwm4fZY62b2xqAmq7XAzhET0qez8oWPs="; }; - vendorHash = "sha256-JJ2B9sUrfo4fiRsxA8mBjvKP0mduIZMaGN8gFC1cTA4="; + vendorHash = "sha256-6RrnsRbQ1+Cx7vnqauisBICgwmvTpJQT32DnIDVc6ts="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; From 921ea9a6c6315a1ff4369cdd0b4362f6165f16e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 15:24:41 +0000 Subject: [PATCH 07/31] scip: 0.3.3 -> 0.4.0 --- pkgs/development/tools/misc/scip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/development/tools/misc/scip/default.nix index c36d4c5b0886..f31673a12f73 100644 --- a/pkgs/development/tools/misc/scip/default.nix +++ b/pkgs/development/tools/misc/scip/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "scip"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; rev = "v${version}"; - hash = "sha256-aSApi6fEKQP5bpuda2Zz6i/5xkyH+mxch803toJsZm8="; + hash = "sha256-o7DWSFd3rPSAOmhTvtI9X0tySNhDL7Jh7iDW8eIYn3w="; }; - vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ="; + vendorHash = "sha256-iFlbZvbj30UpgxJdndpLYcUZSTLQAO2MqJGb/6hO8Uc="; ldflags = [ "-s" From 799c6d78e96b01abebf4f478e9e04445b75dbcea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 01:58:56 +0000 Subject: [PATCH 08/31] micronaut: 4.4.3 -> 4.5.0 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 7e9e83ea6fb3..35dfd3efac54 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.4.3"; + version = "4.5.0"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-lRZs/+oClNdSGapBDt9hROfergHi1cGeP5jlkL8LWxs="; + sha256 = "sha256-zmXBP0lCviqlMhKdbmZeko9XR0AJY9R+YkkKXAA2NW8="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 7aff15e8c4fd3f304d82979a49aa47e9780a105b Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 13 Jun 2024 21:11:40 -0700 Subject: [PATCH 09/31] nixos/systemd-repart: respect NIX_BUILD_CORES for image compression --- nixos/modules/image/repart-image.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index e40406729900..de03beeafc0b 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -90,8 +90,8 @@ let }."${compression.algorithm}"; compressionCommand = { - "zstd" = "zstd --no-progress --threads=0 -${toString compression.level}"; - "xz" = "xz --keep --verbose --threads=0 -${toString compression.level}"; + "zstd" = "zstd --no-progress --threads=$NIX_BUILD_CORES -${toString compression.level}"; + "xz" = "xz --keep --verbose --threads=$NIX_BUILD_CORES -${toString compression.level}"; }."${compression.algorithm}"; in stdenvNoCC.mkDerivation (finalAttrs: From 45ed866c55c1bdaa7ffb2c77acf491faafd2d46d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Jun 2024 00:10:08 +0000 Subject: [PATCH 10/31] mendeley: 2.115.0 -> 2.117.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index acfa14dabb7d..a639c97b9677 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.115.0"; + version = "2.117.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-ir96BQQ+dlUv2aNU9iQ+jnpeLE3D3ow9RPGstREUWNA="; + hash = "sha256-1Gwgb0oUtIjZX0f/HJmA5ihwurq9RlpMMLrTaDav0SM="; }; appimageContents = appimageTools.extractType2 { From 7ee76c32d88c516d237227b09f2904b6b5aabcfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jun 2024 03:04:35 +0000 Subject: [PATCH 11/31] python311Packages.anywidget: 0.9.12 -> 0.9.13 --- pkgs/development/python-modules/anywidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 03b41c11e251..d10f0b369f62 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.12"; + version = "0.9.13"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JYVbJJbcZUE1a20mygyflSUgO7fPKBf4S5O/4/U8+B4="; + hash = "sha256-xlVFW/UfghgusjxZR9N8xB8LH/rK9+K3YxR6IzLLPwc="; }; # We do not need the jupyterlab build dependency, because we do not need to From 21d8efad8965740a108f26424b7ca9073f4ba249 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 24 Jun 2024 10:02:56 -0400 Subject: [PATCH 12/31] rust-analyzer.tests.neovim-lsp: fix race condition --- .../rust/rust-analyzer/test-neovim-lsp.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix index 963e134075ed..49be63a2b99c 100644 --- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix +++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -9,20 +9,33 @@ runCommand "test-neovim-rust-analyzer" { } ''; + # NB. Wait for server done type calculations before sending `hover` request, + # otherwise it would return `{unknown}`. + # Ref: https://github.com/rust-lang/rust-analyzer/blob/7b11fdeb681c12002861b9804a388efde81c9647/docs/dev/lsp-extensions.md#server-status nvimConfig = /* lua */ '' + local caps = vim.lsp.protocol.make_client_capabilities() + caps["experimental"] = { serverStatusNotification = true } vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), vim.lsp.start_client({ cmd = { "rust-analyzer" }, + capabilities = caps, handlers = { - ["$/progress"] = function(_, msg, ctx) - if msg.token == "rustAnalyzer/Indexing" and msg.value.kind == "end" then - vim.cmd("goto 23") -- let mut |var =... - vim.lsp.buf.hover() + ["experimental/serverStatus"] = function(_, msg, ctx) + if msg.health == "ok" then + if msg.quiescent then + vim.cmd("goto 23") -- let mut |var =... + vim.lsp.buf.hover() + end + else + print("error: server status is not ok: ") + vim.cmd("q") end end, ["textDocument/hover"] = function(_, msg, ctx) - -- Keep newlines. - io.write(msg.contents.value) - vim.cmd("q") + if msg then + -- Keep newlines. + io.write(msg.contents.value) + vim.cmd("q") + end end, }, on_error = function(code) From 2ed7545031a8b89d67276f338df72f88ecbc6364 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jun 2024 07:37:13 +0000 Subject: [PATCH 13/31] rust-analyzer-unwrapped: 2024-06-11 -> 2024-06-24 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 941460c35d45..6443cae2f58c 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-06-11"; - cargoSha256 = "sha256-mo3TGaUI1gjJX64Di7+M40CzHkIuFAuXl27yJ9GPkPU="; + version = "2024-06-24"; + cargoSha256 = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/N0sZW3xiivMm5klk9zBtzMlO+uaxnUq35kI3bakLx8="; + sha256 = "sha256-jzZRTQjXhiwEdzo/SlxP72BUa7g0LVr7MEsaR7A/geg="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From 2d04484d15d1e81ceca3c23a0d950d221a7e02f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 01:56:53 +0000 Subject: [PATCH 14/31] schemacrawler: 16.21.2 -> 16.21.4 --- pkgs/development/tools/schemacrawler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index 0d4ffad56977..11a0c0fa7754 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.21.2"; + version = "16.21.4"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-M8kHJOkbxJGpZWOZ1asGYPM76ZWSpkaYIAfWsaisXLs="; + hash = "sha256-8/Wf5RfR8Tb32VyBhHPAtbiqQN1LsnOxy98MWNPkWrM="; }; nativeBuildInputs = [ makeWrapper ]; From 0e6c1d739533789a70de675cbf308f90a1ffbaca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 02:02:24 +0000 Subject: [PATCH 15/31] sqlpage: 0.23.0 -> 0.24.0 --- pkgs/servers/sqlpage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index 0c633bb408e6..affa9d6f3f4e 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -42,13 +42,13 @@ in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-tb3MwH6d/xe05QiBu11iZYICp8eTkKLuQiISoY0zKTE="; + hash = "sha256-1VP5yjyQNBvaAIRhrv1fntZFqSUIAZm5X0J8xQ2HJuM="; }; postPatch = '' @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { "$(cat ${tomselect})" ''; - cargoHash = "sha256-/k9nNxZxyV12pyRep6cTsUoEQobb9sWKnXxQmXmVAl0="; + cargoHash = "sha256-lfiRnaTF1aLs2QU+gv7J48rZSHJdtt8U81odQ1o74R4="; nativeBuildInputs = [ pkg-config From a7cf84d0877db1d8c4c073a40c8018e6e58101b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 11:16:13 +0000 Subject: [PATCH 16/31] rqlite: 8.24.10 -> 8.26.2 --- pkgs/servers/sql/rqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index a76a9968cb2a..ec681de8ff45 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.24.10"; + version = "8.26.2"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cLqCX9ulzsmNFkyaExYuFNOD78TMiNdKEgoJV89Ipxw="; + sha256 = "sha256-GGqnhsEvv8pnaRmJO+IX64VNQVnBaGZcUKMOiW/PJaQ="; }; - vendorHash = "sha256-9UFDpdWK/kQuko3AaWXBiDCa+Wd1hNmPk5rDM9ugoTw="; + vendorHash = "sha256-x1W2niLqhAcroh67cssDuuiJA3Pd5W4Wkh12uKqSfDI="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; From 31a1841a53c88f5897c0795642efda090aeac069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 14 Jun 2024 14:09:49 +0200 Subject: [PATCH 17/31] n8n: 1.9.3 -> 1.46.0, repackage with pnpm.fetchDeps --- pkgs/applications/networking/n8n/default.nix | 54 - .../networking/n8n/generate-dependencies.sh | 21 - .../networking/n8n/node-composition.nix | 17 - pkgs/applications/networking/n8n/node-env.nix | 689 - .../networking/n8n/node-packages.nix | 13476 ---------------- pkgs/applications/networking/n8n/package.json | 3 - pkgs/by-name/n8/n8n/package.nix | 98 + pkgs/top-level/all-packages.nix | 2 - 8 files changed, 98 insertions(+), 14262 deletions(-) delete mode 100644 pkgs/applications/networking/n8n/default.nix delete mode 100755 pkgs/applications/networking/n8n/generate-dependencies.sh delete mode 100644 pkgs/applications/networking/n8n/node-composition.nix delete mode 100644 pkgs/applications/networking/n8n/node-env.nix delete mode 100644 pkgs/applications/networking/n8n/node-packages.nix delete mode 100644 pkgs/applications/networking/n8n/package.json create mode 100644 pkgs/by-name/n8/n8n/package.nix diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix deleted file mode 100644 index 66b5688ddb06..000000000000 --- a/pkgs/applications/networking/n8n/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, stdenv, lib, nixosTests }: - -let - nodePackages = import ./node-composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages.n8n.override { - nativeBuildInputs = [ - pkgs.nodePackages.node-pre-gyp - pkgs.which - pkgs.xcbuild - ]; - - buildInputs = [ - pkgs.libkrb5 - pkgs.libmongocrypt - pkgs.postgresql - ]; - - preRebuild = lib.optionalString stdenv.isAarch64 '' - # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. - # This can supposedly be fixed by building a custom copy of the module from source, but that's way - # too much complexity for a setup no one would ever actually run. - # - # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - rm -rf node_modules/oracledb - - # This package tries to load a prebuilt binary for a different arch, and it doesn't provide the binary for aarch64. - # It is marked as an optional dependency in pnpm-lock.yaml and there are no other references to it n8n. - rm -rf node_modules/@sap/hana-client - ''; - - # makes libmongocrypt bindings not look for static libraries in completely wrong places - BUILD_TYPE = "dynamic"; - - # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. - NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; - - dontNpmInstall = true; - - passthru = { - updateScript = ./generate-dependencies.sh; - tests = nixosTests.n8n; - }; - - meta = with lib; { - description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services"; - maintainers = with maintainers; [ freezeboy k900 ]; - license = licenses.sustainableUse; - mainProgram = "n8n"; - }; -} diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh deleted file mode 100755 index 9bc19abe3ead..000000000000 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -# --strip-optional-dependencies to get rid of deprecated build deps: -# -# n8n -# -> n8n-nodes-base -# -> ssh2-sftp-client -# -> ssh2 -# -> cpu-features -# -> node-gyp@3.8.0 -> python2 -# -> cmake -cd "$(dirname $(readlink -f $0))" - -node2nix \ - --nodejs-18 \ - --strip-optional-dependencies \ - --node-env node-env.nix \ - --input package.json \ - --output node-packages.nix \ - --composition node-composition.nix diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix deleted file mode 100644 index d9c0daef7834..000000000000 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix deleted file mode 100644 index bc1e36628ac8..000000000000 --- a/pkgs/applications/networking/n8n/node-env.nix +++ /dev/null @@ -1,689 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Fixup all executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - if isScript "$file" - then - sed -i 's/\r$//' "$file" # convert crlf to lf - fi - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell < Date: Fri, 14 Jun 2024 14:16:50 +0200 Subject: [PATCH 18/31] n8n: add maintainer gepbird --- pkgs/by-name/n8/n8n/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 17a9b849c2cb..8e0bb92906c8 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/n8n-io/n8n/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ freezeboy + gepbird k900 ]; license = licenses.sustainableUse; From c70e32a2af56c9f71892862281ca6252a4dd5d8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 19:54:58 +0000 Subject: [PATCH 19/31] storj-uplink: 1.105.2 -> 1.107.2 --- pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 5c5625d8dd71..67aea9941676 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.105.2"; + version = "1.107.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-uoMjV0ab/H8WXWawWM9CB/mGTh9odrfmKehRz6A9/Xo="; + hash = "sha256-1VO0kPR9kdterLfLRJrtKfIowppApBCZZaY7yTCncrc="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-HlnnWmjYL/j5RvRKFtEE4ib477erA94aQ+HSF+sCiuA="; + vendorHash = "sha256-CyUthAKwJwocZtvNEy5p/1WmqT4DIl0jN63hiQncrwY="; ldflags = [ "-s" "-w" ]; From 8bce31fa179a8d678a2a8d90193fc3d441657fff Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 27 Jun 2024 08:24:30 +0200 Subject: [PATCH 20/31] python311Packages.ray: 2.30.0 -> 2.31.0 Diff: https://github.com/ray-project/ray/compare/ray-2.30.0...ray-2.31.0 Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.31.0 --- pkgs/development/python-modules/ray/binary-hashes.nix | 7 +++++-- pkgs/development/python-modules/ray/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ray/binary-hashes.nix b/pkgs/development/python-modules/ray/binary-hashes.nix index cf243178e17b..802f7061a7c2 100644 --- a/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,8 +1,11 @@ { cp310 = { - hash = "sha256-m8SBwbXXKU1ocvrBROAOoTlLfhMPtBJJ0WcNtJQVbYE="; + hash = "sha256-iSKDUwJTakE1nStvaMvJ5RwS7+a9JiurOe8wcRjs7Ik="; }; cp311 = { - hash = "sha256-4gO1dWWgCPKsn54ekpIW4NfXdvU0FEzMePZsEFI09wE="; + hash = "sha256-SQ7tIqb+XWqWqUYxAT8PTT9SBnl1us6soJiy9zLHJQI="; + }; + cp312 = { + hash = "sha256-ri2m867sokJjB3wB7yOEEQczRzMglzbCJ0vOomJDhGI="; }; } diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix index f32bd388d577..d0869e8afc08 100644 --- a/pkgs/development/python-modules/ray/default.nix +++ b/pkgs/development/python-modules/ray/default.nix @@ -53,13 +53,13 @@ let pname = "ray"; - version = "2.30.0"; + version = "2.31.0"; in buildPythonPackage rec { inherit pname version; format = "wheel"; - disabled = pythonOlder "3.10" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.10" || pythonAtLeast "3.13"; src = let From 0893083870d9c66decbb7f10fad4d2d45ca60757 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Jun 2024 09:38:11 +0200 Subject: [PATCH 21/31] android-studio: remove gnome_vfs & GConf Those libraries have been deprecated for 10+ years and require daemons that no-one has running these days. --- pkgs/applications/editors/android-studio/common.nix | 4 +--- pkgs/applications/editors/android-studio/default.nix | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 74f7d3c8f7a4..09bc0d43212c 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -17,7 +17,7 @@ , gnugrep , gnused , gnutar -, gtk2, gnome_vfs, glib, GConf +, gtk2, glib , gzip , fontconfig , freetype @@ -175,9 +175,7 @@ let # For GTKLookAndFeel gtk2 - gnome_vfs glib - GConf ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c2bc17f8692b..163948c90dbe 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,11 +1,10 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSEnv, tiling_wm ? false }: +{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { fontDirectories = []; }; - inherit (gnome2) GConf gnome_vfs; inherit buildFHSEnv; inherit tiling_wm; }; From c39bb76400d1e57b4709e90fe207ae4091ecedd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 10:54:50 +0000 Subject: [PATCH 22/31] roddhjav-apparmor-rules: 0-unstable-2024-06-16 -> 0-unstable-2024-06-27 --- pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index d1218c05c9c1..8709e0b4de99 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-06-16"; + version = "0-unstable-2024-06-27"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "747292e95402298553dec3b2dd923a6c62ad2077"; - hash = "sha256-SWNo6qJNR4XGZc79JQXsab0vppDf1D5GXH/iMmdi5WQ="; + rev = "86b2f74a24fdf2957f6aad28fb999fa6a2e43e82"; + hash = "sha256-ns6j8ChJpV4ryxajGmdbRlJj3eL8qRIYzrD4VPfTYDY="; }; dontConfigure = true; From 347397124085669d8282518e7693b45d7a35024b Mon Sep 17 00:00:00 2001 From: Redyf Date: Thu, 27 Jun 2024 12:46:16 -0300 Subject: [PATCH 23/31] ollama: 0.1.45 -> 0.1.47 changelog: https://github.com/ollama/ollama/releases/tag/v0.1.46 changelog: https://github.com/ollama/ollama/releases/tag/v0.1.47 --- pkgs/by-name/ol/ollama/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 2bfb8eb97c3c..94de36bce94d 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -31,13 +31,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-AKAuySyReG6kkwwgWodAso44+kri2Gz5VSLco8GBoIw="; + hash = "sha256-gxai2ORHABchnmdzjr9oYzk9p21qQjSIxrKt5k356i4="; fetchSubmodules = true; }; @@ -53,6 +53,7 @@ let (preparePatch "04-metal.diff" "sha256-Ne8J9R8NndUosSK0qoMvFfKNwqV5xhhce1nSoYrZo7Y=") (preparePatch "05-default-pretokenizer.diff" "sha256-JnCmFzAkmuI1AqATG3jbX7nGIam4hdDKqqbG5oh7h70=") (preparePatch "06-qwen2.diff" "sha256-nMtoAQUsjYuJv45uTlz8r/K1oF5NUsc75SnhgfSkE30=") + (preparePatch "07-gemma.diff" "sha256-dKJrRvg/XC6xtwxLHZ7lFkLNMwT8Ugmd5xRPuKQDXvU=") ]; preparePatch = patch: hash: fetchpatch { From df57515a3af4489e50f64cac6bd57a40e89e9573 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sat, 22 Jun 2024 15:46:48 +0200 Subject: [PATCH 24/31] sysdig: 0.37.1 -> 0.38.0 --- pkgs/os-specific/linux/sysdig/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index ff149e771bcb..af63740097b0 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, openssl, curl, jq, gcc, elfutils, tbb -, protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash }: +, protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash, clang, libbpf, bpftools }: let - # Compare with https://github.com/draios/sysdig/blob/0.37.1/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.16.0"; - libsHash = "sha256-aduO2pLj91tRdZ1dW1F1JFEg//SopialXWPd6Oav/u8="; + # Compare with https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/falcosecurity-libs.cmake + libsRev = "0.17.2"; + libsHash = "sha256-BTLXtdU7GjOJReaycHvXkSd2vtybnCn0rTR7OEsvaMQ="; - # Compare with https://github.com/falcosecurity/libs/blob/0.16.0/cmake/modules/valijson.cmake + # Compare with https://github.com/falcosecurity/libs/blob/0.17.2/cmake/modules/valijson.cmake valijson = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; @@ -15,15 +15,15 @@ let hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; }; - # https://github.com/draios/sysdig/blob/0.37.1/cmake/modules/driver.cmake + # https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "7.1.0+driver"; + rev = "7.2.0+driver"; hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; - version = "0.37.1"; + version = "0.38.0"; in stdenv.mkDerivation { pname = "sysdig"; inherit version; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-V1rvQ6ZznL9UiUFW2lyW6gvdoGttOd5kgT2KPQCjmvQ="; + hash = "sha256-y6WArSz57w8vb3A3nHT37G6D8++6en2jQfeIS4YCD9U="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -53,6 +53,9 @@ in stdenv.mkDerivation { nlohmann_json zstd uthash + clang + libbpf + bpftools ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From 0cbd664f8eb609ce48dce092a05a9f30f9da47a5 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 27 Jun 2024 21:31:46 +0200 Subject: [PATCH 25/31] sysdig: nixfmt-rfc-style --- pkgs/os-specific/linux/sysdig/default.nix | 124 ++++++++++++++-------- 1 file changed, 82 insertions(+), 42 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index af63740097b0..1162b3363cae 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,6 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles, pkg-config -, luajit, ncurses, perl, jsoncpp, openssl, curl, jq, gcc, elfutils, tbb -, protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash, clang, libbpf, bpftools }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kernel, + installShellFiles, + pkg-config, + luajit, + ncurses, + perl, + jsoncpp, + openssl, + curl, + jq, + gcc, + elfutils, + tbb, + protobuf, + grpc, + yaml-cpp, + nlohmann_json, + re2, + zstd, + uthash, + clang, + libbpf, + bpftools, +}: let # Compare with https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/falcosecurity-libs.cmake @@ -24,7 +50,8 @@ let }; version = "0.38.0"; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "sysdig"; inherit version; @@ -35,7 +62,12 @@ in stdenv.mkDerivation { hash = "sha256-y6WArSz57w8vb3A3nHT37G6D8++6en2jQfeIS4YCD9U="; }; - nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; + nativeBuildInputs = [ + cmake + perl + installShellFiles + pkg-config + ]; buildInputs = [ luajit ncurses @@ -100,48 +132,56 @@ in stdenv.mkDerivation { # fix compiler warnings been treated as errors "-Wno-error"; - preConfigure = '' - if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then - echo "falcosecurity-libs checksum needs to be updated!" - exit 1 - fi - cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization") - '' + lib.optionalString (kernel != null) '' - export INSTALL_MOD_PATH="$out" - export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - ''; + preConfigure = + '' + if ! grep -q "${libsRev}" cmake/modules/falcosecurity-libs.cmake; then + echo "falcosecurity-libs checksum needs to be updated!" + exit 1 + fi + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization") + '' + + lib.optionalString (kernel != null) '' + export INSTALL_MOD_PATH="$out" + export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ''; - postInstall = '' - # Fix the bash completion location - installShellCompletion --bash $out/etc/bash_completion.d/sysdig - rm $out/etc/bash_completion.d/sysdig - rmdir $out/etc/bash_completion.d - rmdir $out/etc - '' + lib.optionalString (kernel != null) '' - make install_driver - kernel_dev=${kernel.dev} - kernel_dev=''${kernel_dev#${builtins.storeDir}/} - kernel_dev=''${kernel_dev%%-linux*dev*} - if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then - sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko - else - for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do - if test -f "$i"; then - xz -d $i - sed -i "s#$kernel_dev#................................#g" ''${i%.xz} - xz -9 ''${i%.xz} - fi - done - fi - ''; + postInstall = + '' + # Fix the bash completion location + installShellCompletion --bash $out/etc/bash_completion.d/sysdig + rm $out/etc/bash_completion.d/sysdig + rmdir $out/etc/bash_completion.d + rmdir $out/etc + '' + + lib.optionalString (kernel != null) '' + make install_driver + kernel_dev=${kernel.dev} + kernel_dev=''${kernel_dev#${builtins.storeDir}/} + kernel_dev=''${kernel_dev%%-linux*dev*} + if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then + sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko + else + for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do + if test -f "$i"; then + xz -d $i + sed -i "s#$kernel_dev#................................#g" ''${i%.xz} + xz -9 ''${i%.xz} + fi + done + fi + ''; meta = { - description = - "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; - license = with lib.licenses; [ asl20 gpl2Only mit ]; + description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; + license = with lib.licenses; [ + asl20 + gpl2Only + mit + ]; maintainers = with lib.maintainers; [ raskin ]; platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; - broken = kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); + broken = + kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); homepage = "https://sysdig.com/opensource/"; downloadPage = "https://github.com/draios/sysdig/releases"; }; From feaa0e9f800382b2b8009f46bab0ef1486362cf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 23:43:24 +0000 Subject: [PATCH 26/31] bevelbar: 23.08 -> 24.06 --- pkgs/by-name/be/bevelbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix index 60dfb62567bf..e91299ae9720 100644 --- a/pkgs/by-name/be/bevelbar/package.nix +++ b/pkgs/by-name/be/bevelbar/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bevelbar"; - version = "23.08"; + version = "24.06"; src = fetchurl { url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz"; - hash = "sha256-4wMSPi9tu+z1AW2uvPefxkeT/5DYo2oJybhNnpe82QU="; + hash = "sha256-A7nrpMty4uxbiLzW83cmxlhQh8et1qo/n0mwBXNLJOc="; }; nativeBuildInputs = [ pkg-config ]; From 954ecd7bebd8d483217bb3b7ff576899b080f725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 23:59:22 +0000 Subject: [PATCH 27/31] redpanda-client: 24.1.8 -> 24.1.9 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c85de32d8a83..6f48af42c9b2 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -6,12 +6,12 @@ , stdenv }: let - version = "24.1.8"; + version = "24.1.9"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-Eemo1NhRa6CX+fgtNT22zoQqN8Vrrl8mkqhy4zmhJHo="; + sha256 = "sha256-/A6BzhCdN8e7mV/Tp9TYfOmSAjmaa4S3FNCko4G9Vgs="; }; in buildGoModule rec { From f88031231e7ebb14bb3f785f17a3f631945a5631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jun 2024 23:21:20 +0000 Subject: [PATCH 28/31] git-interactive-rebase-tool: 2.4.0 -> 2.4.1 --- .../git-interactive-rebase-tool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 366f34e10d40..6019e2eb7a4b 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - hash = "sha256-xwvL6QX+eMbxCouE1i86j/PRCxTJVAQnRVeK6fYQo/M="; + hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; }; - cargoHash = "sha256-RDGbsmOBVMxInstTrRZK0G5eZR79ZoFK5UlkCj3zpoY="; + cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From c3a0b828e978e3a10bd135717a741c8907ec7a5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jun 2024 01:38:02 +0000 Subject: [PATCH 29/31] open-policy-agent: 0.65.0 -> 0.66.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 6c2d5175c3f5..06161d95c4b2 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-nf/xQ5744cplTNYkwaUbGv7Dw0BGf52dWTjnTVa9qL8="; + hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; }; vendorHash = null; From e2ca8d5a95a8858b79df1a30486476e82e101ffb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Jun 2024 21:39:23 +0200 Subject: [PATCH 30/31] =?UTF-8?q?coqPackages.coq-ext-lib:=200.12.0=20?= =?UTF-8?q?=E2=86=92=200.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index f4459ef29b78..4ec805e8f028 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.14" "8.20"; out = "0.12.1"; } { case = range "8.11" "8.19"; out = "0.12.0"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -13,6 +14,7 @@ mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.12.1".sha256 = "sha256-YIHyiRUHPy/LGM2DMTRKRwP7j6OSBYKpu6wO2mZOubo="; release."0.12.0".sha256 = "sha256-9szpnWoS83bDc+iLqElfgz0LNRo9hSRQwUFIgpTca4c="; release."0.11.8".sha256 = "sha256-uUBKJb7XjRnyb7rCisZrDcaDdsp1Bv1lXDIU3Ce8e5k="; release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; From ea780bcedbe728b5e7447d3730bcef976b0063cc Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 26 Jun 2024 15:25:15 -0700 Subject: [PATCH 31/31] ocamlPackages.reason-native: 2022-08-31-a0ddab6 -> -unstable-2024-05-07 Upstream doesn't use releases, branches, or tags, so this is the most recent commit: https://github.com/reasonml/reason-native/commit/20b1997b6451d9715dfdbeec86a9d274c7430ed8 * ocamlPackages.reason-native.cli: init at 0.0.1-alpha-unstable-2024-05-07 * ocamlPackages.reason-native.console: 2022-08-31-a0ddab6 -> 0.1.0-unstable-2024-05-07 * ocamlPackages.reason-native.dir: 2022-08-31-a0ddab6 -> 0.0.1-unstable-2024-05-07 * ocamlPackages.reason-native.file-context-printer: 2022-08-31-a0ddab6 -> 0.0.3-unstable-2024-05-07 * ocamlPackages.reason-native.fp: 2022-08-31-a0ddab6 -> 0.0.1-unstable-2024-05-07 * ocamlPackages.reason-native.frame: init at 0.0.1-unstable-2024-05-07 * ocamlPackages.reason-native.fs: init at 0.0.2-unstable-2024-05-07 * ocamlPackages.reason-native.pastel: 2022-08-31-a0ddab6 -> 0.3.0-unstable-2024-05-07 * ocamlPackages.reason-native.pastel-console: 2022-08-31-a0ddab6 -> 0.0.0-unstable-2024-05-07 * ocamlPackages.reason-native.qcheck-rely: 2022-08-31-a0ddab6 -> 1.0.2-unstable-2024-05-07 * ocamlPackages.reason-native.refmterr: 2022-08-31-a0ddab6 -> 3.3.0-unstable-2024-05-07 * ocamlPackages.reason-native.rely: 2022-08-31-a0ddab6 -> 4.0.0-unstable-2024-05-07 * ocamlPackages.reason-native.rely-junit-reporter: 2022-08-31-a0ddab6 -> 1.0.0-unstable-2024-05-07 * ocamlPackages.reason-native.unicode: init at 0.0.0-unstable-2024-05-07 * ocamlPackages.reason-native.unicode-config: init at 0.0.0-unstable-2024-05-07 * ocamlPackages.reason-native.utf8: init at 0.1.0-unstable-2024-05-07 The version numbers are taken from upstream's `.json` file. I also fixed and updated `ocamlPackages.reason-native.console.tests` so that it builds and no longer includes its `default.nix` file. --- .../ocaml-modules/reason-native/cli.nix | 14 ++- .../ocaml-modules/reason-native/console.nix | 13 +-- .../ocaml-modules/reason-native/default.nix | 88 ++++++++++--------- .../ocaml-modules/reason-native/dir.nix | 9 +- .../reason-native/file-context-printer.nix | 9 +- .../ocaml-modules/reason-native/fp.nix | 9 +- .../ocaml-modules/reason-native/frame.nix | 24 +++++ .../ocaml-modules/reason-native/fs.nix | 24 +++++ .../reason-native/pastel-console.nix | 9 +- .../ocaml-modules/reason-native/pastel.nix | 10 ++- .../reason-native/qcheck-rely.nix | 20 ++--- .../ocaml-modules/reason-native/refmterr.nix | 9 +- .../reason-native/rely-junit-reporter.nix | 9 +- .../ocaml-modules/reason-native/rely.nix | 9 +- .../{console-test.opam => console_test.opam} | 0 .../{console-test.re => console_test.re} | 0 .../reason-native/tests/console/default.nix | 24 +++-- .../reason-native/tests/console/dune | 4 +- .../reason-native/tests/console/dune-project | 1 + .../reason-native/unicode-config.nix | 19 ++++ .../ocaml-modules/reason-native/unicode.nix | 19 ++++ .../ocaml-modules/reason-native/utf8.nix | 20 +++++ 22 files changed, 258 insertions(+), 85 deletions(-) create mode 100644 pkgs/development/ocaml-modules/reason-native/frame.nix create mode 100644 pkgs/development/ocaml-modules/reason-native/fs.nix rename pkgs/development/ocaml-modules/reason-native/tests/console/{console-test.opam => console_test.opam} (100%) rename pkgs/development/ocaml-modules/reason-native/tests/console/{console-test.re => console_test.re} (100%) create mode 100644 pkgs/development/ocaml-modules/reason-native/tests/console/dune-project create mode 100644 pkgs/development/ocaml-modules/reason-native/unicode-config.nix create mode 100644 pkgs/development/ocaml-modules/reason-native/unicode.nix create mode 100644 pkgs/development/ocaml-modules/reason-native/utf8.nix diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix index ee5e7d2774d2..c6c5abfb7f9a 100644 --- a/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -1,7 +1,10 @@ -{ re, reason, pastel, ... }: +{ lib, buildDunePackage, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "cli"; + version = "0.0.1-alpha-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -11,4 +14,11 @@ re pastel ]; + + meta = { + downloadPage = "https://github.com/reasonml/reason-native"; + homepage = "https://reason-native.com/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; } diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix index a39ba9a7e3ec..38d95a0c0f39 100644 --- a/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/pkgs/development/ocaml-modules/reason-native/console.nix @@ -1,21 +1,24 @@ -{ buildDunePackage, callPackage, reason, console, ... }: +{ lib, buildDunePackage, callPackage, reason, console, src }: + +buildDunePackage { + inherit src; -{ pname = "console"; + version = "0.1.0-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; passthru.tests = { - console = callPackage ./tests/console { - inherit buildDunePackage reason console; - }; + console = callPackage ./tests/console { }; }; meta = { description = "Library providing a web-influenced polymorphic console API for native Console.log(anything) with runtime printing"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/console"; homepage = "https://reason-native.com/docs/console/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix index 024783cf6184..b44e63080e5c 100644 --- a/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/default.nix @@ -1,43 +1,47 @@ -{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }: +{ + lib, + newScope, + fetchFromGitHub, + atdgen, + buildDunePackage, + junit, + ppxlib, + qcheck-core, + re, + reason, +}: -let - generic = (somePath: - let - prepkg = import somePath { - inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch; - inherit (reason-native) console file-context-printer fp pastel rely; - }; - in - buildDunePackage - ({ - version = "2022-08-31-a0ddab6"; - src = fetchFromGitHub { - owner = "reasonml"; - repo = "reason-native"; - rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a"; - hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8="; - }; - duneVersion = "3"; - meta = with lib; { - description = "Libraries for building and testing native Reason programs"; - downloadPage = "https://github.com/reasonml/reason-native"; - homepage = "https://reason-native.com/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - } // (prepkg.meta or {}); - } // prepkg) - ); - cli = generic ./cli.nix; # Used only by Rely. -in - lib.makeScope newScope (self: with self; { - console = generic ./console.nix; - dir = generic ./dir.nix; - file-context-printer = generic ./file-context-printer.nix; - fp = generic ./fp.nix; - pastel = generic ./pastel.nix; - pastel-console = generic ./pastel-console.nix; - qcheck-rely = generic ./qcheck-rely.nix; - refmterr = generic ./refmterr.nix; - rely = generic ./rely.nix; - rely-junit-reporter = generic ./rely-junit-reporter.nix; - }) +lib.makeScope newScope (self: { + inherit lib buildDunePackage re reason ppxlib; + + # Upstream doesn't use tags, releases, or branches. + src = fetchFromGitHub { + owner = "reasonml"; + repo = "reason-native"; + rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8"; + hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs="; + }; + + cli = self.callPackage ./cli.nix { }; + console = self.callPackage ./console.nix { }; + dir = self.callPackage ./dir.nix { }; + file-context-printer = self.callPackage ./file-context-printer.nix { }; + frame = self.callPackage ./frame.nix { }; + fp = self.callPackage ./fp.nix { }; + fs = self.callPackage ./fs.nix { }; + pastel = self.callPackage ./pastel.nix { }; + pastel-console = self.callPackage ./pastel-console.nix { }; + qcheck-rely = self.callPackage ./qcheck-rely.nix { + inherit qcheck-core; + }; + refmterr = self.callPackage ./refmterr.nix { + inherit atdgen; + }; + rely = self.callPackage ./rely.nix { }; + rely-junit-reporter = self.callPackage ./rely-junit-reporter.nix { + inherit atdgen junit; + }; + unicode-config = self.callPackage ./unicode-config.nix { }; + unicode = self.callPackage ./unicode.nix { }; + utf8 = self.callPackage ./utf8.nix { }; +}) diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix index 8b09eafc3696..6cd04ece01f6 100644 --- a/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -1,7 +1,10 @@ -{ reason, fp, ... }: +{ lib, buildDunePackage, reason, fp, src }: + +buildDunePackage { + inherit src; -{ pname = "dir"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -14,5 +17,7 @@ meta = { description = "Library that provides a consistent API for common system, user and application directories consistently on all platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/dir"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index a7c663493ef5..462b667921c1 100644 --- a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -1,7 +1,10 @@ -{ reason, re, pastel, ... }: +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "file-context-printer"; + version = "0.0.3-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Utility for displaying snippets of files on the command line"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/file-context-printer"; homepage = "https://reason-native.com/docs/file-context-printer/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix index 7df1c84e55cf..35a099771dc6 100644 --- a/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -1,7 +1,10 @@ -{ reason, ... }: +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; -{ pname = "fp"; + version = "0.0.1-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -10,5 +13,7 @@ meta = { description = "Library for creating and operating on file paths consistently on multiple platforms"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/frame.nix b/pkgs/development/ocaml-modules/reason-native/frame.nix new file mode 100644 index 000000000000..dc845db55249 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/frame.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, reason, re, pastel, src }: + +buildDunePackage { + inherit src; + + pname = "frame"; + version = "0.0.1-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + pastel + re + ]; + + meta = { + description = "Reason Native text layout library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/frame"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/fs.nix b/pkgs/development/ocaml-modules/reason-native/fs.nix new file mode 100644 index 000000000000..c553f6a6ad98 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/fs.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, fp, reason, src }: + +buildDunePackage { + inherit src; + + pname = "fs"; + version = "0.0.2-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + propagatedBuildInputs = [ + fp + ]; + + meta = { + description = "Reason Native file system API"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/fs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index 968b9f88af91..1a424fad5401 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -1,7 +1,10 @@ -{ reason, console, pastel, ... }: +{ lib, buildDunePackage, reason, console, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel-console"; + version = "0.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -16,5 +19,7 @@ description = "Small library for pretty coloring to Console output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel-console"; homepage = "https://reason-native.com/docs/pastel/console"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix index 6d08243638ca..d8a4d7e0f9ca 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -1,13 +1,17 @@ -{ reason, re, ... }: +{ lib, buildDunePackage, reason, re, src }: + +buildDunePackage { + inherit src; -{ pname = "pastel"; + version = "0.3.0-unstable-2024-05-07"; minimalOCamlVersion = "4.05"; nativeBuildInputs = [ reason ]; + propagatedBuildInputs = [ re ]; @@ -16,5 +20,7 @@ description = "Text formatting library that harnesses Reason JSX to provide intuitive terminal output. Like React but for CLI"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/pastel"; homepage = "https://reason-native.com/docs/pastel/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index ac645791f46c..4006df5d90c8 100644 --- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -1,23 +1,15 @@ -{ qcheck-core, reason, console, rely, fetchpatch, ... }: +{ lib, buildDunePackage, qcheck-core, reason, console, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "qcheck-rely"; + version = "1.0.2-unstable-2024-05-07"; nativeBuildInputs = [ reason ]; - patches = [ - (fetchpatch { - url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch"; - hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4="; - includes = [ - "src/qcheck-rely/QCheckRely.re" - "src/qcheck-rely/QCheckRely.rei" - ]; - }) - ]; - propagatedBuildInputs = [ qcheck-core console @@ -27,5 +19,7 @@ meta = { description = "Library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 17c595d9e107..3f320fd2364d 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -1,7 +1,10 @@ -{ atdgen, re, reason, pastel, ... }: +{ lib, buildDunePackage, atdgen, re, reason, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "refmterr"; + version = "3.3.0-unstable-2024-05-07"; nativeBuildInputs = [ atdgen @@ -18,5 +21,7 @@ description = "Error formatter tool for Reason and OCaml. Takes raw error output from compiler and converts to pretty output"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/refmterr"; homepage = "https://reason-native.com/docs/refmterr/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 25d9cc2c5f70..46097c45ebdf 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -1,7 +1,10 @@ -{ atdgen, junit, re, reason, pastel, rely, ... }: +{ lib, buildDunePackage, atdgen, junit, re, reason, pastel, rely, src }: + +buildDunePackage { + inherit src; -{ pname = "rely-junit-reporter"; + version = "1.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -22,5 +25,7 @@ description = "Tool providing JUnit Reporter for Rely Testing Framework"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely-junit-reporter"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix index 40315a668ba9..e3ca4b9ad5e9 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -1,7 +1,10 @@ -{ re, reason, cli, file-context-printer, pastel, ... }: +{ lib, buildDunePackage, re, reason, cli, file-context-printer, pastel, src }: + +buildDunePackage { + inherit src; -{ pname = "rely"; + version = "4.0.0-unstable-2024-05-07"; nativeBuildInputs = [ reason @@ -18,5 +21,7 @@ description = "Jest-inspired testing framework for native OCaml/Reason"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/rely"; homepage = "https://reason-native.com/docs/rely/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam similarity index 100% rename from pkgs/development/ocaml-modules/reason-native/tests/console/console-test.opam rename to pkgs/development/ocaml-modules/reason-native/tests/console/console_test.opam diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re b/pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re similarity index 100% rename from pkgs/development/ocaml-modules/reason-native/tests/console/console-test.re rename to pkgs/development/ocaml-modules/reason-native/tests/console/console_test.re diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix index fc7f1891339b..b2bc31565f04 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/default.nix @@ -1,20 +1,34 @@ -{ lib, buildDunePackage, reason, console }: +{ lib, buildDunePackage, reason, console, ppxlib }: -buildDunePackage rec { - pname = "console-test"; +buildDunePackage { + pname = "console_test"; version = "1"; - src = ./.; + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./console_test.opam + ./console_test.re + ./dune + ./dune-project + ]; + }; duneVersion = "3"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ reason console + ppxlib ]; doInstallCheck = true; + postInstallCheck = '' - $out/bin/console-test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null + $out/bin/console_test | grep -q "{\"Hello fellow Nixer!\"}" > /dev/null ''; } diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune b/pkgs/development/ocaml-modules/reason-native/tests/console/dune index 49f2121385e2..3bf2eefb27db 100644 --- a/pkgs/development/ocaml-modules/reason-native/tests/console/dune +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune @@ -1,4 +1,4 @@ (executable - (name console-test) - (public_name console-test) + (name console_test) + (public_name console_test) (libraries reason console.lib)) diff --git a/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project b/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project new file mode 100644 index 000000000000..a26d6e273960 --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/tests/console/dune-project @@ -0,0 +1 @@ +(lang dune 1.6) diff --git a/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix new file mode 100644 index 000000000000..1b80ae2a71fd --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/unicode-config.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode-config"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Configuration used to generate the @reason-native/unicode library"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode-config"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/unicode.nix b/pkgs/development/ocaml-modules/reason-native/unicode.nix new file mode 100644 index 000000000000..544367424d0b --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/unicode.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "unicode"; + version = "0.0.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Easy to use and well documented Unicode symbols"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/unicode"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/ocaml-modules/reason-native/utf8.nix b/pkgs/development/ocaml-modules/reason-native/utf8.nix new file mode 100644 index 000000000000..40c874b5b41f --- /dev/null +++ b/pkgs/development/ocaml-modules/reason-native/utf8.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, reason, src }: + +buildDunePackage { + inherit src; + + pname = "utf8"; + version = "0.1.0-unstable-2024-05-07"; + + nativeBuildInputs = [ + reason + ]; + + meta = { + description = "Utf8 logic with minimal dependencies"; + downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/utf8"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} +