diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fc7587677e6..d44d969a6d08 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12880,6 +12880,12 @@
githubId = 6022042;
name = "Sam Parkinson";
};
+ samhug = {
+ email = "s@m-h.ug";
+ github = "samhug";
+ githubId = 171470;
+ name = "Sam Hug";
+ };
samlich = {
email = "nixos@samli.ch";
github = "samlich";
@@ -13098,7 +13104,7 @@
github = "Scrumplex";
githubId = 11587657;
keys = [{
- fingerprint = "AF1F B107 E188 CB97 9A94 FD7F C104 1129 4912 A422";
+ fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951";
}];
};
scubed2 = {
@@ -13846,6 +13852,12 @@
githubId = 1699155;
name = "Steve Elliott";
};
+ stefanfehrenbach = {
+ email = "stefan.fehrenbach@gmail.com";
+ github = "fehrenbach";
+ githubId = 203168;
+ name = "Stefan Fehrenbach";
+ };
stehessel = {
email = "stephan@stehessel.de";
github = "stehessel";
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
index b8affabb8647..1ae5fede272b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@@ -189,7 +189,22 @@
doInstallCheck is set. (Note that this
change will not cause breakage to derivations with
strictDeps unset, which are most packages
- except python, rust and go packages).
+ except python, rust, ocaml and go packages).
+
+
+
+
+ buildDunePackage now defaults to
+ strictDeps = true which means that any
+ library should go into buildInputs or
+ checkInputs. Any executable that is run on
+ the building machine should go into
+ nativeBuildInputs or
+ nativeCheckInputs respectively. Example of
+ executables are ocaml,
+ findlib and menhir. PPXs
+ are libraries which are built by dune and should therefore not
+ go into nativeBuildInputs.
@@ -675,6 +690,13 @@
conversion.
+
+
+ Grafana Tempo has been updated to version 2.0. See the
+ upstream
+ upgrade guide for migration instructions.
+
+
A new virtualisation.rosetta module was
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index 96f67673211d..2977a9e6a1c7 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -54,7 +54,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead.
-- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust and go packages).
+- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust, ocaml and go packages).
+
+- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`.
- `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep).
@@ -175,6 +177,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `services.grafana` listens only on localhost by default again. This was changed to upstreams default of `0.0.0.0` by accident in the freeform setting conversion.
+- Grafana Tempo has been updated to version 2.0. See the [upstream upgrade guide](https://grafana.com/docs/tempo/latest/release-notes/v2-0/#upgrade-considerations) for migration instructions.
+
- A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).
- The new option `users.motdFile` allows configuring a Message Of The Day that can be updated dynamically.
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 337370a6ddb7..2518b6bd7d99 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -41,13 +41,13 @@
stdenv.mkDerivation rec {
pname = "gnome-builder";
- version = "43.4";
+ version = "43.5";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "Hg1tZ4RcGb7J463VlpX5pTHXKg5UKyA6zJD7OBInwrw=";
+ sha256 = "Rav15H1s4jzjTXjFcOgeBrIntD6ZoRMlcy7GXhskU+o=";
};
patches = [
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5610f40b61ec..c449f6be2f63 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -498,12 +498,12 @@ final: prev:
aerial-nvim = buildVimPluginFrom2Nix {
pname = "aerial.nvim";
- version = "2023-02-01";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
- rev = "30a64f8590482dcd461123cb66464ff371aeeb84";
- sha256 = "15rzr9p685ylv37amkfv0finnimhzlp2lmzkm8gdqzl0xhsfa2rn";
+ rev = "4428a478e70f6a6b52e86d16ced677020267f409";
+ sha256 = "18dvm2k6h0xvzhf6wr317b9j85qq46gkh2scxmi8b20p8d3kfi52";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -785,6 +785,18 @@ final: prev:
meta.homepage = "https://github.com/rmagatti/auto-session/";
};
+ autoclose-nvim = buildVimPluginFrom2Nix {
+ pname = "autoclose.nvim";
+ version = "2023-02-03";
+ src = fetchFromGitHub {
+ owner = "m4xshen";
+ repo = "autoclose.nvim";
+ rev = "5c63f2c28a48d556644f3650daccdf0ba03ea177";
+ sha256 = "0c8klbm0wwr1rq1kkq2lq18n3d8kbi977zac70xc8h3dcfdnzc4m";
+ };
+ meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
+ };
+
autoload_cscope-vim = buildVimPluginFrom2Nix {
pname = "autoload_cscope.vim";
version = "2011-01-28";
@@ -1471,12 +1483,12 @@ final: prev:
cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix {
pname = "cmp-nvim-lsp-signature-help";
- version = "2022-10-14";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-nvim-lsp-signature-help";
- rev = "d2768cb1b83de649d57d967085fe73c5e01f8fd7";
- sha256 = "13imcdv0yws084z2x2lmdj17zy4ngf126i7djknnwp2jfkca1120";
+ rev = "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1";
+ sha256 = "0bkviamzpkw6yv4cyqa9pqm1g2gsvzk87v8xc4574yf86jz5hg68";
};
meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/";
};
@@ -3336,24 +3348,24 @@ final: prev:
gitlinker-nvim = buildVimPluginFrom2Nix {
pname = "gitlinker.nvim";
- version = "2022-09-26";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "ruifm";
repo = "gitlinker.nvim";
- rev = "c68d4873a14d2ae614875685ccca2e49472989e8";
- sha256 = "1lr55vn4mr9gdhr1zxihm98hjv1ypp47k5vhq5fkv14sd37hmwf8";
+ rev = "cc59f732f3d043b626c8702cb725c82e54d35c25";
+ sha256 = "000gg83j6fcx6iwp39m3dljfpg0f5vna8pkvwp1b13jf4hjyzcff";
};
meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
};
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
- version = "2023-01-27";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "0d4fe37ba5285171f3729da955955205f3fa945b";
- sha256 = "0bpi4xhpi031sgrkxdqrrl7fk16wdkk1k7ln6b8qyf5vyhkcckfz";
+ rev = "ec4742a7eebf68bec663041d359b95637242b5c3";
+ sha256 = "18bwp15m2v4mrxp9i2vz061cfpv3ah08c8il3fx24aqhfbmaq6lz";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -3599,12 +3611,12 @@ final: prev:
haskell-tools-nvim = buildVimPluginFrom2Nix {
pname = "haskell-tools.nvim";
- version = "2023-01-31";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
- rev = "2e63d6336822a3676fdd27b0aa49cb2da08d1b17";
- sha256 = "0v4hc613smq1gry56imfy65cqy5128za4i5zfy1zvh3x1ppbqqvw";
+ rev = "6e19cdf88d0d681312db5e27a4a2ef6b8e43fc47";
+ sha256 = "0i6l2fvwww7kljp3321j4vp5wlmnlgf8hk6v1r0jmi7qs172zg1d";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@@ -4835,12 +4847,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2023-01-31";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "8e007cf3ae8db59bd926a9fbaf7f0d25a7fe67ca";
- sha256 = "02pq68d5c3g009qsjsbns0bswg1riq61l8giykhg09r0lbj28zn1";
+ rev = "4f97a8771a480bcacf1d1d0dbf82e47f682aba2c";
+ sha256 = "1pnivvwh9bfddmqvzgs4qsc3qy2m8j4zk31d5l6dgz8bfp45c7w1";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -5219,12 +5231,12 @@ final: prev:
neodev-nvim = buildVimPluginFrom2Nix {
pname = "neodev.nvim";
- version = "2023-01-28";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "folke";
repo = "neodev.nvim";
- rev = "8fd21037453f4306f500e437c5cbdf6e8b6c2f99";
- sha256 = "0zxac4425677w3pvj5yp7sxllmnj4bhwc6kwwa6c409wvyzrfas2";
+ rev = "d9a8d651501cd2f287742472af4b3103d991cd68";
+ sha256 = "1pi2b2j647cwc58cp5iwgrrfls7lfwh7573r092k3c42i2x9k8cd";
};
meta.homepage = "https://github.com/folke/neodev.nvim/";
};
@@ -5303,12 +5315,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2023-02-02";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "36cc15300c0dfc19d483b0a4176cb89e94f4730a";
- sha256 = "07c0lib513d5m7b9y0g0h8g681pyjnh0p9vr93z2y31va5all7w0";
+ rev = "6cc56c6b50fcac81471805d50db7cf5770cb5e8a";
+ sha256 = "1zwcbfl23rnk7hq5d2m0blxwanlws3hikk7k89cbsc76kwqims2y";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -5651,12 +5663,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2023-01-31";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "c3e678110d5f31854c6575cf4bda3b82f3d4a884";
- sha256 = "045anxnny6rlfrj18wqqrdy69j0b6qpgiirabjas6hcyh3sjgrx6";
+ rev = "8f5d730021497233c39d3adbf4b8043d4be163f8";
+ sha256 = "0isrsbba9clpjjx5z37p4d0s8fasd7gxr1gxxjsvgkp2yn7blvi0";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -5783,12 +5795,12 @@ final: prev:
nvim-cmp = buildNeovimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2023-01-26";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "e7e2ef7031db8e0cfad7ad9916ec766ddd9dbb3b";
- sha256 = "1jd1x6rg9k5gjwnlfrhmy976xky6sm7335hcz2lpgjapgy7rnyz7";
+ rev = "cfafe0a1ca8933f7b7968a287d39904156f2c57d";
+ sha256 = "1qgvlvjwah6581vppsb8racgkfjpjx2xqbk2ji1fmczc3rsk80h6";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -6395,12 +6407,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2023-02-02";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "660a070af7131387c690c7b839718371916e27f9";
- sha256 = "10imjkvk4p8pljyk8imh6r2x5vydxk4wmk5yw5gkrghnx8ql0bmq";
+ rev = "588cdb6c0652356dacc7d29bb4bb2b273df2df86";
+ sha256 = "087gdja192ziqzy3npz598l5yk0fly2n0g5748axsbbzb8l1a429";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -7500,18 +7512,6 @@ final: prev:
meta.homepage = "https://github.com/kovisoft/slimv/";
};
- smartpairs-vim = buildVimPluginFrom2Nix {
- pname = "smartpairs.vim";
- version = "2018-01-01";
- src = fetchFromGitHub {
- owner = "gorkunov";
- repo = "smartpairs.vim";
- rev = "dc754c29509b1a942552b3cfa348e4aae209322c";
- sha256 = "1pyynwz7wfbgccdxsyggzl0301qjj3wgyymah5spx8b3s42a6slj";
- };
- meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
- };
-
smart-splits-nvim = buildVimPluginFrom2Nix {
pname = "smart-splits.nvim";
version = "2022-12-21";
@@ -7524,6 +7524,18 @@ final: prev:
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
};
+ smartpairs-vim = buildVimPluginFrom2Nix {
+ pname = "smartpairs.vim";
+ version = "2018-01-01";
+ src = fetchFromGitHub {
+ owner = "gorkunov";
+ repo = "smartpairs.vim";
+ rev = "dc754c29509b1a942552b3cfa348e4aae209322c";
+ sha256 = "1pyynwz7wfbgccdxsyggzl0301qjj3wgyymah5spx8b3s42a6slj";
+ };
+ meta.homepage = "https://github.com/gorkunov/smartpairs.vim/";
+ };
+
snap = buildVimPluginFrom2Nix {
pname = "snap";
version = "2022-08-03";
@@ -10099,12 +10111,12 @@ final: prev:
vim-endwise = buildVimPluginFrom2Nix {
pname = "vim-endwise";
- version = "2022-08-17";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-endwise";
- rev = "4e5c8358d751625bb040b187b9fe430c2b769f0a";
- sha256 = "0vfkvq20kr6jbm526vkvyliv4zybha7jpp7iaimvw4zx1mjs5pih";
+ rev = "43301cf9a0fafd78cec7c2e5b9c0e2cfd9436e8a";
+ sha256 = "0lcgax5m1zmngdz5dk9lx89didicw831zgyyjx0w9iih6d9amj18";
};
meta.homepage = "https://github.com/tpope/vim-endwise/";
};
@@ -10495,12 +10507,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2023-01-15";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "9e64fc1ab60b2e97d39410482b64289dbbaf4eda";
- sha256 = "01vj5c89g6fblrybx2f95ji9blcdjyqrr120qwbq9kawbgja1giy";
+ rev = "7bf2074f340447c10b3af4ace96cc61e5f325693";
+ sha256 = "0ry67a7g0dpgaiwfcr79pgpw54x5v8dmfg4pypyd039ini0l0w46";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -11109,12 +11121,12 @@ final: prev:
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
- version = "2023-01-10";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
- rev = "653fb20b4c0eedabdc5486719b571813d5c8878c";
- sha256 = "1y6hzjx4qknwvilqxshqgl8q6wy7ycabmlzy2kgww7257cxsan1x";
+ rev = "ab78b1b16601274c1b93a43792080ef3faff06e9";
+ sha256 = "0k2h8508x6ga4gayrknrdqh6w5jhpf4vbz0ba8018264pnvz9fqd";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@@ -12524,6 +12536,30 @@ final: prev:
meta.homepage = "https://github.com/t9md/vim-smalls/";
};
+ vim-smartbd = buildVimPluginFrom2Nix {
+ pname = "vim-smartbd";
+ version = "2015-12-20";
+ src = fetchFromGitHub {
+ owner = "Industrial";
+ repo = "vim-smartbd";
+ rev = "62c267401f634d4f8f65933c812469610ba505ea";
+ sha256 = "0a4ls93bgy5r7ar3r60zgdn2jzdkk10wrws14lw2xl8yg65rc0mg";
+ };
+ meta.homepage = "https://github.com/Industrial/vim-smartbd/";
+ };
+
+ vim-smartbw = buildVimPluginFrom2Nix {
+ pname = "vim-smartbw";
+ version = "2015-12-20";
+ src = fetchFromGitHub {
+ owner = "Industrial";
+ repo = "vim-smartbw";
+ rev = "8091e5e452f63b10d4c9eacf0cc84cba394148f7";
+ sha256 = "08i8qyqahj2jv44pay7bi2dxajhsrx244i44v53y4iiddps6smxn";
+ };
+ meta.homepage = "https://github.com/Industrial/vim-smartbw/";
+ };
+
vim-smoothie = buildVimPluginFrom2Nix {
pname = "vim-smoothie";
version = "2022-06-10";
@@ -14005,12 +14041,12 @@ final: prev:
lspsaga-nvim-original = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim-original";
- version = "2023-02-02";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "f621bd86398617c93d54170de224eb7f608f21cf";
- sha256 = "0kvl6qsfdhd947azz58xwvm3lgys0i03xnx2ksq4f44g5r714083";
+ rev = "a2e3f7cf76f4cb102d3fc165bd8c9a565053e84f";
+ sha256 = "1d0ha7pjjzbhvkcn0z1dgnz2r3jkviad0hipvcw1xy5jnnym4sm5";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 4c00f7d205d1..65b954a65f08 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -60,12 +60,12 @@
};
bash = buildGrammar {
language = "bash";
- version = "88ed46b";
+ version = "7f9506c";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-bash";
- rev = "88ed46b8c32782379d5cab8bc9ea111ca7ad7dcb";
- hash = "sha256-eUW0MuRC5aElfYsBScjics0h6+FOrZ3oWDCjJqsJdhc=";
+ rev = "7f9506c34ab6a0f4e3e052b7a49cbeef91f71236";
+ hash = "sha256-D9FesfedHnHWUcCIPGs72fpgeBO3xZ2rWTRDewa4qzM=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
};
@@ -437,12 +437,12 @@
};
func = buildGrammar {
language = "func";
- version = "ea161a0";
+ version = "88ee7d0";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-func";
- rev = "ea161a03f738872426c9bcc207ec0f4763f9672c";
- hash = "sha256-JhPEZ9w/zoxlDwKZmw1e+NXV9jTDx9cmTmeWtLq5hlE=";
+ rev = "88ee7d0f569af10ab8c78a12f37217a8d15a0ffa";
+ hash = "sha256-SLI59AtprfCQr6VccCVr+2sazEtUSXnAwHcclWrkXxA=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-func";
};
@@ -934,24 +934,24 @@
};
markdown = buildGrammar {
language = "markdown";
- version = "63cda48";
+ version = "abea13b";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
- rev = "63cda483a37c91eae817f33bc55680f228845566";
- hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg=";
+ rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
+ hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
};
location = "tree-sitter-markdown";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
};
markdown_inline = buildGrammar {
language = "markdown_inline";
- version = "63cda48";
+ version = "abea13b";
src = fetchFromGitHub {
owner = "MDeiml";
repo = "tree-sitter-markdown";
- rev = "63cda483a37c91eae817f33bc55680f228845566";
- hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg=";
+ rev = "abea13b86c404564991244b69b7afc4ca362d0c0";
+ hash = "sha256-gdRl+jTSGlijc3/hn1BYClAlpYljzSRVpRoi9Q446PU=";
};
location = "tree-sitter-markdown-inline";
meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1412,12 +1412,12 @@
};
sql = buildGrammar {
language = "sql";
- version = "8d28e17";
+ version = "30e15d4";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
- rev = "8d28e173285ca4bee8113157cb15662a6928925a";
- hash = "sha256-zBAJGYMRBt3nQJqHQITW4rMAAhktOIdtIjle9idvXx0=";
+ rev = "30e15d45dceb24ea51acf81ee7d75d81567b6e02";
+ hash = "sha256-s8jeS8FRDPQQ9Iq0Vi12GrshM/E8opdPI0Xxre5oL0I=";
};
generate = true;
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@@ -1617,12 +1617,12 @@
};
v = buildGrammar {
language = "v";
- version = "6e9daed";
+ version = "719cf0c";
src = fetchFromGitHub {
owner = "vlang";
repo = "vls";
- rev = "6e9daed18b99f5a3515c5142a0ab66a7bca589d2";
- hash = "sha256-ejUcwjOraywdliTBvmkedmC2nobdg6L9FrWgNbXkYIQ=";
+ rev = "719cf0cd297f9b2f45ecfbeb0115379fb8cfa9c3";
+ hash = "sha256-4xb5x/JZN1pFvPVqazcZMdZm8DTpBb5nW5AgOrB3YHc=";
};
location = "tree_sitter_v";
meta.homepage = "https://github.com/vlang/vls";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 6df9c0a226c1..27125fb21fe8 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -64,6 +64,7 @@ https://github.com/hotwatermorning/auto-git-diff/,,
https://github.com/jiangmiao/auto-pairs/,,
https://github.com/pocco81/auto-save.nvim/,HEAD,
https://github.com/rmagatti/auto-session/,,
+https://github.com/m4xshen/autoclose.nvim/,HEAD,
https://github.com/vim-scripts/autoload_cscope.vim/,,
https://github.com/rafi/awesome-vim-colorschemes/,,
https://github.com/ayu-theme/ayu-vim/,,
@@ -1051,6 +1052,8 @@ https://github.com/tpope/vim-sleuth/,,
https://github.com/jpalardy/vim-slime/,,
https://github.com/mzlogin/vim-smali/,,
https://github.com/t9md/vim-smalls/,,
+https://github.com/Industrial/vim-smartbd/,HEAD,
+https://github.com/Industrial/vim-smartbw/,HEAD,
https://github.com/psliwka/vim-smoothie/,,
https://github.com/bohlender/vim-smt2/,,
https://github.com/justinmk/vim-sneak/,,
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 1d684f3ee3f3..1e6195021c69 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -18,17 +18,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5";
- x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4";
- aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6";
- aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk";
- armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7";
+ x86_64-linux = "1b1xk4f736lxg7vsqhnra0x1vvb3x9fj7ijxqk5liz5pap18k1c8";
+ x86_64-darwin = "1pi2kspq162aaj42ssmrf67bbdk4n0vx618z8avxnbx3wbcrsnap";
+ aarch64-linux = "1j6qim8k94a2baj8w098l6x3i94n34g62c1brfmhha8fr48jzlir";
+ aarch64-darwin = "0agl2n6ljd5rc5shypn5j1292pf673nhqhmwhg5bg9qsawar0ksf";
+ armv7l-linux = "10k4pzp9lyn5g8frgixcx9jyixwckr1481d1npdzrgcdwfwrmf20";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.74.3";
+ version = "1.75.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix
new file mode 100644
index 000000000000..8df8b7680139
--- /dev/null
+++ b/pkgs/applications/graphics/emblem/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, rustPlatform
+, pkg-config
+, meson
+, ninja
+, glib
+, gobject-introspection
+, libadwaita
+, libxml2
+, librsvg
+, wrapGAppsHook4
+, appstream-glib
+, desktop-file-utils
+}:
+
+stdenv.mkDerivation rec {
+ pname = "emblem";
+ version = "1.1.0";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World/design";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-kNPV1SHkNTBXbMzDJGuDbaGz1WkBqMpVgZKjsh7ejmo=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-yhXxlUOe+mWVpAEB0yN9m5S5yfNRrHnx7XHLXbbf1hc=";
+ };
+
+ nativeBuildInputs = [
+ appstream-glib
+ glib
+ gobject-introspection
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook4
+ ] ++ (with rustPlatform; [
+ cargoSetupHook
+ rust.cargo
+ rust.rustc
+ ]);
+
+ buildInputs = [
+ desktop-file-utils
+ libadwaita
+ librsvg
+ libxml2
+ ];
+
+ meta = with lib; {
+ description = "Generate project icons and avatars from a symbolic icon";
+ homepage = "https://gitlab.gnome.org/World/design/emblem";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ foo-dogsquared ];
+ };
+}
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index b1d3a5c0d6fc..443a03c2ad22 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -19,8 +19,10 @@ stdenv.mkDerivation rec {
src = ./fix-build-bash.patch;
});
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper ocaml ];
+ buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];
dontStrip = true;
diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index 45ca034b7471..f7b902cf54cb 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -2,7 +2,7 @@
, fetchurl
, lib
, makeWrapper
-, electron_21
+, electron
, makeDesktopItem
, graphicsmagick
, writeScript
@@ -50,7 +50,7 @@ let
installPhase = ''
runHook preInstall
mkdir -p $out/bin
- makeWrapper ${electron_21}/bin/electron $out/bin/obsidian \
+ makeWrapper ${electron}/bin/electron $out/bin/obsidian \
--add-flags $out/share/obsidian/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix
index ffb62dd6c199..a7366d6136ff 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/pkgs/applications/misc/orpie/default.nix
@@ -19,7 +19,8 @@ ocamlPackages.buildDunePackage rec {
substituteInPlace src/orpie/install.ml.in --replace '@prefix@' $out
'';
- buildInputs = with ocamlPackages; [ curses camlp5 num gsl ];
+ nativeBuildInputs = [ ocamlPackages.camlp5 ];
+ buildInputs = with ocamlPackages; [ curses num gsl ];
meta = {
inherit (src.meta) homepage;
diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix
new file mode 100644
index 000000000000..ca4a1742e1e1
--- /dev/null
+++ b/pkgs/applications/misc/pop-launcher/default.nix
@@ -0,0 +1,60 @@
+{ rustPlatform
+, fetchFromGitHub
+, lib
+, fd
+, libqalculate
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "pop-launcher";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "pop-os";
+ repo = "launcher";
+ rev = version;
+ sha256 = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0=";
+ };
+
+ postPatch = ''
+ substituteInPlace src/lib.rs \
+ --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher"
+ substituteInPlace plugins/src/scripts/mod.rs \
+ --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher"
+ substituteInPlace plugins/src/calc/mod.rs \
+ --replace 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")'
+ substituteInPlace plugins/src/find/mod.rs \
+ --replace 'spawn("fd")' 'spawn("${fd}/bin/fd")'
+ substituteInPlace plugins/src/terminal/mod.rs \
+ --replace '/usr/bin/gnome-terminal' 'gnome-terminal'
+ '';
+
+ cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
+
+ cargoBuildFlags = [ "--package" "pop-launcher-bin" ];
+
+ postInstall = ''
+ mv $out/bin/pop-launcher{-bin,}
+
+ plugins_dir=$out/share/pop-launcher/plugins
+ scripts_dir=$out/share/pop-launcher/scripts
+ mkdir -p $plugins_dir $scripts_dir
+
+ for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do
+ mkdir $plugins_dir/$plugin
+ cp plugins/src/$plugin/*.ron $plugins_dir/$plugin
+ ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/')
+ done
+
+ for script in scripts/*; do
+ cp -r $script $scripts_dir
+ done
+ '';
+
+ meta = with lib; {
+ description = "Modular IPC-based desktop launcher service";
+ homepage = "https://github.com/pop-os/launcher";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ samhug ];
+ };
+}
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index 1d6373592fbf..c840bbfe5b84 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -20,7 +20,8 @@ buildDunePackage rec {
sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x";
};
- buildInputs = [ fmt lwt_ppx menhir ocf_ppx ppx_blob xtmpl_ppx ];
+ nativeBuildInputs = [ menhir ];
+ buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ];
propagatedBuildInputs = [
dune-build-info
dune-site
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 2101306e420f..05e40ae79054 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -40,7 +40,7 @@
assert stdenv.cc.isGNU;
assert with lib.strings; (
versionAtLeast stdenv.cc.version "7.1"
- && versionOlder stdenv.cc.version "12"
+ && versionOlder stdenv.cc.version "13"
);
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 81062c1eb7c5..2367f847d107 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
};
doCheck = true;
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index a6d7bf7276e3..fdfb992192b3 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.24";
ptb = "0.0.38";
- canary = "0.0.145";
+ canary = "0.0.146";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@@ -22,7 +22,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "sha256-TF+7SnCTsbh+Z8AeEESEFVLSpD3c5HOAwpU1UBuB1BU=";
+ sha256 = "sha256-5GiG+RGqwHUdIeSVWpbaIw3sTuZbvIQeetXSEvSqTls=";
};
};
x86_64-darwin = {
diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 1535b694231e..6a1b5086bc93 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -57,7 +57,7 @@ buildPythonApplication rec {
description = "Simple but convenient CLI-based Matrix client app for sending and receiving";
homepage = "https://github.com/8go/matrix-commander";
license = licenses.gpl3Plus;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = [ maintainers.seb314 ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json
index 3e5af22c824a..a0e94dc0f1d6 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json
+++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json
@@ -1,9 +1,9 @@
{
- "version": "1.11.13-sc.1",
- "rev": "v1.11.13-sc.1",
- "srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g",
- "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn",
- "jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al",
- "reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn",
- "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5"
+ "version": "1.11.22-sc.1",
+ "rev": "v1.11.22-sc.1",
+ "srcHash": "0di80hjd0d8bsbgbnddbmdjllc7cssgaxy27kd50j4dmw8qll1hv",
+ "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df",
+ "jsSdkYarnHash": "0a8c7y34wh8bk1v35sa1s3s4piqkzvhjrzzapack4kzl1pfn0vix",
+ "reactSdkYarnHash": "0nhw9vk0yk2v738b2w6jjq5pfib5j66m5maxczhm40zync8b1wmp",
+ "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv"
}
diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
index 0573c7231e27..cf2c44f5f2f2 100644
--- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix
@@ -58,13 +58,18 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';
+ # Only affects unused scripts in $out/share/element/electron/scripts. Also
+ # breaks because there are some `node`-scripts with a `npx`-shebang and
+ # this shouldn't be in the closure just for unused scripts.
+ dontPatchShebangs = true;
+
buildPhase = ''
runHook preBuild
pushd element-desktop
- npx tsc
- yarn run i18n
- node ./scripts/copy-res.js
+ yarn --offline run build:ts
+ yarn --offline run i18n
+ yarn --offline run build:res
popd
runHook postBuild
@@ -97,10 +102,6 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
- # Do not attempt generating a tarball for element-web again.
- # note: `doDist = false;` does not work.
- distPhase = ";";
-
# The desktop item properties should be kept in sync with data from upstream:
# https://github.com/schildichat/element-desktop/blob/sc/package.json
desktopItems = [
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 86f246767726..01afe03fd448 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -40,13 +40,13 @@ let
sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==";
};
};
- "@azure/core-client-1.7.0" = {
+ "@azure/core-client-1.7.1" = {
name = "_at_azure_slash_core-client";
packageName = "@azure/core-client";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz";
- sha512 = "fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw==";
+ url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz";
+ sha512 = "85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg==";
};
};
"@azure/core-http-2.3.1" = {
@@ -67,22 +67,22 @@ let
sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA==";
};
};
- "@azure/core-lro-2.5.0" = {
+ "@azure/core-lro-2.5.1" = {
name = "_at_azure_slash_core-lro";
packageName = "@azure/core-lro";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz";
- sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ==";
+ url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz";
+ sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ==";
};
};
- "@azure/core-paging-1.4.0" = {
+ "@azure/core-paging-1.5.0" = {
name = "_at_azure_slash_core-paging";
packageName = "@azure/core-paging";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.4.0.tgz";
- sha512 = "tabFtZTg8D9XqZKEfNUOGh63SuYeOxmvH4GDcOJN+R1bZWZ1FZskctgY9Pmuwzhn+0Xvq9rmimK9hsvtLkeBsw==";
+ url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz";
+ sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==";
};
};
"@azure/core-rest-pipeline-1.10.1" = {
@@ -256,13 +256,13 @@ let
sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g==";
};
};
- "@babel/parser-7.20.13" = {
+ "@babel/parser-7.20.15" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.20.13";
+ version = "7.20.15";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz";
- sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz";
+ sha512 = "DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==";
};
};
"@babel/runtime-7.20.13" = {
@@ -292,22 +292,22 @@ let
sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw==";
};
};
- "@codemirror/lang-css-6.0.1" = {
+ "@codemirror/lang-css-6.0.2" = {
name = "_at_codemirror_slash_lang-css";
packageName = "@codemirror/lang-css";
- version = "6.0.1";
+ version = "6.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.1.tgz";
- sha512 = "rlLq1Dt0WJl+2epLQeAsfqIsx3lGu4HStHCJu95nGGuz2P2fNugbU3dQYafr2VRjM4eMC9HviI6jvS98CNtG5w==";
+ url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz";
+ sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw==";
};
};
- "@codemirror/lang-javascript-6.1.2" = {
+ "@codemirror/lang-javascript-6.1.3" = {
name = "_at_codemirror_slash_lang-javascript";
packageName = "@codemirror/lang-javascript";
- version = "6.1.2";
+ version = "6.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.2.tgz";
- sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==";
+ url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.3.tgz";
+ sha512 = "u3JgK9AwfNpyGwRhtzIVxVfH9yOK5ZNswmaN6W+XFuUXzW9o8CGgnSBEcaUgZ0hdLvHQHyM+3+22HKgbItki/w==";
};
};
"@codemirror/language-6.4.0" = {
@@ -616,6 +616,51 @@ let
sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
};
};
+ "@jsplumb/browser-ui-5.13.2" = {
+ name = "_at_jsplumb_slash_browser-ui";
+ packageName = "@jsplumb/browser-ui";
+ version = "5.13.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.2.tgz";
+ sha512 = "BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ==";
+ };
+ };
+ "@jsplumb/common-5.13.2" = {
+ name = "_at_jsplumb_slash_common";
+ packageName = "@jsplumb/common";
+ version = "5.13.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.2.tgz";
+ sha512 = "ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q==";
+ };
+ };
+ "@jsplumb/connector-bezier-5.13.2" = {
+ name = "_at_jsplumb_slash_connector-bezier";
+ packageName = "@jsplumb/connector-bezier";
+ version = "5.13.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.2.tgz";
+ sha512 = "AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg==";
+ };
+ };
+ "@jsplumb/core-5.13.2" = {
+ name = "_at_jsplumb_slash_core";
+ packageName = "@jsplumb/core";
+ version = "5.13.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.2.tgz";
+ sha512 = "IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A==";
+ };
+ };
+ "@jsplumb/util-5.13.2" = {
+ name = "_at_jsplumb_slash_util";
+ packageName = "@jsplumb/util";
+ version = "5.13.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.2.tgz";
+ sha512 = "POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g==";
+ };
+ };
"@kafkajs/confluent-schema-registry-1.0.6" = {
name = "_at_kafkajs_slash_confluent-schema-registry";
packageName = "@kafkajs/confluent-schema-registry";
@@ -688,13 +733,13 @@ let
sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==";
};
};
- "@lezer/lr-1.3.1" = {
+ "@lezer/lr-1.3.3" = {
name = "_at_lezer_slash_lr";
packageName = "@lezer/lr";
- version = "1.3.1";
+ version = "1.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.1.tgz";
- sha512 = "+GymJB/+3gThkk2zHwseaJTI5oa4AuOuj1I2LCslAVq1dFZLSX8SAe4ZlJq1TjezteDXtF/+d4qeWz9JvnrG9Q==";
+ url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz";
+ sha512 = "JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w==";
};
};
"@mapbox/node-pre-gyp-1.0.10" = {
@@ -769,13 +814,13 @@ let
sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==";
};
};
- "@oclif/command-1.8.21" = {
+ "@oclif/command-1.8.22" = {
name = "_at_oclif_slash_command";
packageName = "@oclif/command";
- version = "1.8.21";
+ version = "1.8.22";
src = fetchurl {
- url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz";
- sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ==";
+ url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz";
+ sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw==";
};
};
"@oclif/config-1.18.6" = {
@@ -787,6 +832,15 @@ let
sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA==";
};
};
+ "@oclif/config-1.18.8" = {
+ name = "_at_oclif_slash_config";
+ packageName = "@oclif/config";
+ version = "1.18.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.8.tgz";
+ sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg==";
+ };
+ };
"@oclif/core-1.26.1" = {
name = "_at_oclif_slash_core";
packageName = "@oclif/core";
@@ -823,13 +877,13 @@ let
sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==";
};
};
- "@oclif/parser-3.8.9" = {
+ "@oclif/parser-3.8.10" = {
name = "_at_oclif_slash_parser";
packageName = "@oclif/parser";
- version = "3.8.9";
+ version = "3.8.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz";
- sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg==";
+ url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz";
+ sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ==";
};
};
"@oclif/screen-3.0.4" = {
@@ -976,49 +1030,49 @@ let
sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA==";
};
};
- "@sentry/core-7.34.0" = {
+ "@sentry/core-7.36.0" = {
name = "_at_sentry_slash_core";
packageName = "@sentry/core";
- version = "7.34.0";
+ version = "7.36.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz";
- sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw==";
+ url = "https://registry.npmjs.org/@sentry/core/-/core-7.36.0.tgz";
+ sha512 = "lq1MlcMhvm7QIwUOknFeufkg4M6QREY3s61y6pm1o+o3vSqB7Hz0D19xlyEpP62qMn8OyuttVKOVK1UfGc2EyQ==";
};
};
- "@sentry/integrations-7.34.0" = {
+ "@sentry/integrations-7.36.0" = {
name = "_at_sentry_slash_integrations";
packageName = "@sentry/integrations";
- version = "7.34.0";
+ version = "7.36.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz";
- sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ==";
+ url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.36.0.tgz";
+ sha512 = "wrRoUqdeGi64NNimGVk8U8DBiXamxTYPBux0/faFDyau8EJyQFcv8zOyB78Za4W2Ss3ZXNaE/WtFF8UxalHzBQ==";
};
};
- "@sentry/node-7.34.0" = {
+ "@sentry/node-7.36.0" = {
name = "_at_sentry_slash_node";
packageName = "@sentry/node";
- version = "7.34.0";
+ version = "7.36.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz";
- sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg==";
+ url = "https://registry.npmjs.org/@sentry/node/-/node-7.36.0.tgz";
+ sha512 = "nAHAY+Rbn5OlTpNX/i6wYrmw3hT/BtwPZ/vNU52cKgw7CpeE1UrCeFjnPn18rQPB7lIh7x0vNvoaPrfemRzpSQ==";
};
};
- "@sentry/types-7.34.0" = {
+ "@sentry/types-7.36.0" = {
name = "_at_sentry_slash_types";
packageName = "@sentry/types";
- version = "7.34.0";
+ version = "7.36.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz";
- sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw==";
+ url = "https://registry.npmjs.org/@sentry/types/-/types-7.36.0.tgz";
+ sha512 = "uvfwUn3okAWSZ948D/xqBrkc3Sn6TeHUgi3+p/dTTNGAXXskzavgfgQ4rSW7f3YD4LL+boZojpoIARVLodMGuA==";
};
};
- "@sentry/utils-7.34.0" = {
+ "@sentry/utils-7.36.0" = {
name = "_at_sentry_slash_utils";
packageName = "@sentry/utils";
- version = "7.34.0";
+ version = "7.36.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz";
- sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg==";
+ url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.36.0.tgz";
+ sha512 = "mgDi5X5Bm0sydCzXpnyKD/sD98yc2qnKXyRdNX4HRRwruhC/P53LT0hGhZXsyqsB/l8OAMl0zWXJLg0xONQsEw==";
};
};
"@servie/events-1.0.0" = {
@@ -1039,22 +1093,22 @@ let
sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==";
};
};
- "@swc/core-1.3.29" = {
+ "@swc/core-1.3.32" = {
name = "_at_swc_slash_core";
packageName = "@swc/core";
- version = "1.3.29";
+ version = "1.3.32";
src = fetchurl {
- url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz";
- sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg==";
+ url = "https://registry.npmjs.org/@swc/core/-/core-1.3.32.tgz";
+ sha512 = "Yx/n1j+uUkcqlJAW8IRg8Qymgkdow6NHJZPFShiR0YiaYq2sXY+JHmvh16O6GkL91Y+gTlDUS7uVgDz50czJUQ==";
};
};
- "@swc/wasm-1.3.29" = {
+ "@swc/wasm-1.3.32" = {
name = "_at_swc_slash_wasm";
packageName = "@swc/wasm";
- version = "1.3.29";
+ version = "1.3.32";
src = fetchurl {
- url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz";
- sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw==";
+ url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.32.tgz";
+ sha512 = "u27gmXtbe/y4M5fo38NCBKUFeFIWRCmppABxPvM9TsZ8KhO4EdZOI1L9sPHSZvVyAXRpnwC8cjYej/zOAZjAQA==";
};
};
"@techteamer/ocsp-1.0.0" = {
@@ -1912,13 +1966,13 @@ let
sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ==";
};
};
- "aws-sdk-2.1304.0" = {
+ "aws-sdk-2.1308.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1304.0";
+ version = "2.1308.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz";
- sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1308.0.tgz";
+ sha512 = "tm4UXah8dCqt1geyxrtoyp6dN5QhuLjNeACUZEsffww5oZPMx24EX9dAtvtSu3UfIHwmbR74QomYi1c1u8Jndg==";
};
};
"aws-sign2-0.7.0" = {
@@ -2326,13 +2380,13 @@ let
sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg==";
};
};
- "bull-4.10.2" = {
+ "bull-4.10.3" = {
name = "bull";
packageName = "bull";
- version = "4.10.2";
+ version = "4.10.3";
src = fetchurl {
- url = "https://registry.npmjs.org/bull/-/bull-4.10.2.tgz";
- sha512 = "xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ==";
+ url = "https://registry.npmjs.org/bull/-/bull-4.10.3.tgz";
+ sha512 = "pp403srpkn9tYi7Z3Mu0sozehZ7rEEFGNJnN+nLxQwml6MySzefC9bPeCYedZoCkXdZ6VbIB8uNkMZg+hN/dAg==";
};
};
"busboy-1.6.0" = {
@@ -2686,13 +2740,13 @@ let
sha512 = "ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ==";
};
};
- "codemirror-lang-n8n-expression-0.1.0" = {
+ "codemirror-lang-n8n-expression-0.2.0" = {
name = "codemirror-lang-n8n-expression";
packageName = "codemirror-lang-n8n-expression";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.1.0.tgz";
- sha512 = "20ss5p0koTu5bfivr1sBHYs7cpjWT2JhVB5gn7TX9WWPt+v/9p9tEcYSOyL/sm+OFuWh698Cgnmrba4efQnMCQ==";
+ url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.2.0.tgz";
+ sha512 = "kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ==";
};
};
"codepage-1.15.0" = {
@@ -2929,13 +2983,13 @@ let
sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==";
};
};
- "content-type-1.0.4" = {
+ "content-type-1.0.5" = {
name = "content-type";
packageName = "content-type";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
- sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
+ url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz";
+ sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==";
};
};
"convict-6.2.4" = {
@@ -3361,13 +3415,13 @@ let
sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==";
};
};
- "deepmerge-4.2.2" = {
+ "deepmerge-4.3.0" = {
name = "deepmerge";
packageName = "deepmerge";
- version = "4.2.2";
+ version = "4.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz";
- sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==";
+ url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz";
+ sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==";
};
};
"default-user-agent-1.0.0" = {
@@ -5908,15 +5962,6 @@ let
sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==";
};
};
- "jsplumb-2.15.4" = {
- name = "jsplumb";
- packageName = "jsplumb";
- version = "2.15.4";
- src = fetchurl {
- url = "https://registry.npmjs.org/jsplumb/-/jsplumb-2.15.4.tgz";
- sha512 = "QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g==";
- };
- };
"jsprim-1.4.2" = {
name = "jsprim";
packageName = "jsprim";
@@ -6043,13 +6088,13 @@ let
sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==";
};
};
- "libphonenumber-js-1.10.18" = {
+ "libphonenumber-js-1.10.19" = {
name = "libphonenumber-js";
packageName = "libphonenumber-js";
- version = "1.10.18";
+ version = "1.10.19";
src = fetchurl {
- url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz";
- sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og==";
+ url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.19.tgz";
+ sha512 = "MDZ1zLIkfSDZV5xBta3nuvbEOlsnKCPe4z5r3hyup/AXveevkl9A1eSWmLhd2FX4k7pJDe4MrLeQsux0HI/VWg==";
};
};
"libpq-1.8.12" = {
@@ -6520,24 +6565,6 @@ let
sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==";
};
};
- "luxon-2.3.2" = {
- name = "luxon";
- packageName = "luxon";
- version = "2.3.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz";
- sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw==";
- };
- };
- "luxon-2.5.2" = {
- name = "luxon";
- packageName = "luxon";
- version = "2.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz";
- sha512 = "Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA==";
- };
- };
"luxon-3.2.1" = {
name = "luxon";
packageName = "luxon";
@@ -6844,13 +6871,13 @@ let
sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==";
};
};
- "minipass-4.0.0" = {
+ "minipass-4.0.1" = {
name = "minipass";
packageName = "minipass";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz";
- sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==";
+ url = "https://registry.npmjs.org/minipass/-/minipass-4.0.1.tgz";
+ sha512 = "V9esFpNbK0arbN3fm2sxDKqMYgIp7XtVdE4Esj+PE4Qaaxdg1wIw48ITQIOn1sc8xXSmUviVL3cyjMqPlrVkiA==";
};
};
"minipass-collect-1.0.2" = {
@@ -7051,13 +7078,13 @@ let
sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ==";
};
};
- "msgpackr-1.8.2" = {
+ "msgpackr-1.8.3" = {
name = "msgpackr";
packageName = "msgpackr";
- version = "1.8.2";
+ version = "1.8.3";
src = fetchurl {
- url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz";
- sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ==";
+ url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.3.tgz";
+ sha512 = "m2JefwcKNzoHYXkH/5jzHRxAw7XLWsAdvu0FOJ+OLwwozwOV/J6UA62iLkfIMbg7G8+dIuRwgg6oz+QoQ4YkoA==";
};
};
"mssql-7.3.5" = {
@@ -7114,13 +7141,13 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
- "n8n-core-0.152.0" = {
+ "n8n-core-0.153.0" = {
name = "n8n-core";
packageName = "n8n-core";
- version = "0.152.0";
+ version = "0.153.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.152.0.tgz";
- sha512 = "Bx+4vv3E7SwjFvxLDqzpDbJwVzDUYAw1QTcqAfMnHpkUM9uxlYHV5U3kgSsjpkw0TAF7RVVroHWFYWgnrW9XHA==";
+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.153.0.tgz";
+ sha512 = "m5yikbWxe2IgA2P1ryUzlE4alNWPDha1vF3zoIgHfdZObR7UyoYohlJpT6l5LUcduCQVE87t1rspnJd4MY0hrQ==";
};
};
"n8n-design-system-0.52.0" = {
@@ -7132,31 +7159,31 @@ let
sha512 = "Dd6SdWYDjlhgrpPbof4DFPP4hPdpH9cA+3YkFSCgQLNyCi0RdqiQJqPQ5xQFlNVaxd6a7R69RHy/oNwt6/+cLw==";
};
};
- "n8n-editor-ui-0.179.0" = {
+ "n8n-editor-ui-0.180.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.179.0";
+ version = "0.180.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.179.0.tgz";
- sha512 = "mo1HoCA7myKzkNkZgmjp9UZ5euxDUX+ZPAyLCoxI+HXki3mhVxELeffzbkBiXAfezi9xlaYAKzehg5HuUyiHjg==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.180.0.tgz";
+ sha512 = "Xbjumqnc9chwVWDulXsIhXZ8r9i1nYUzJGBepC6xNM8kTaCRwCokfxUALfFPGNRUBg/A47ez89TNgDY9Mu/X3w==";
};
};
- "n8n-nodes-base-0.211.0" = {
+ "n8n-nodes-base-0.212.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.211.0";
+ version = "0.212.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.211.0.tgz";
- sha512 = "AoERAZJTuztzCuVvSeAPJk0fko4XcnlK7oweum08+0C1g0X1o9iHQE2kkoHwTxsY77eS6mRbGd2r6OCggpKftQ==";
+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.212.0.tgz";
+ sha512 = "OENgQkAU70krTAoElQkQTX61Bh/rz2cpip+WDFea+KTXTBqU1gQDNlt3IZdhkS1l0F4e1VfblQawqMeJVFxwbA==";
};
};
- "n8n-workflow-0.134.0" = {
+ "n8n-workflow-0.135.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
- version = "0.134.0";
+ version = "0.135.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.134.0.tgz";
- sha512 = "m9sbI29zCXSeFprBEQ+Lqk1E53iI2Dbu0LoL+5Nw3fBcbxnTYCxReD9pSssZSKlHzb9BHSMSYeZk4pK5RyQuvw==";
+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.135.0.tgz";
+ sha512 = "4KTWgul6DHk7rOP2Pj2XsEw4wWfJo29CCLXImgMHkOqR0SWxZT2lRvlqggxlDD1KkmnEddHghLzxOCGxgRHxFg==";
};
};
"named-placeholders-1.1.3" = {
@@ -7312,13 +7339,13 @@ let
sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==";
};
};
- "node-fetch-2.6.8" = {
+ "node-fetch-2.6.9" = {
name = "node-fetch";
packageName = "node-fetch";
- version = "2.6.8";
+ version = "2.6.9";
src = fetchurl {
- url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.8.tgz";
- sha512 = "RZ6dBYuj8dRSfxpUSu+NsdF1dpPpluJxwOp+6IoDp/sH2QNDSvurYsAa+F1WxY2RjA1iP93xhcsUoYbF2XBqVg==";
+ url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz";
+ sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==";
};
};
"node-forge-1.3.1" = {
@@ -8221,13 +8248,13 @@ let
sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==";
};
};
- "pinia-2.0.29" = {
+ "pinia-2.0.30" = {
name = "pinia";
packageName = "pinia";
- version = "2.0.29";
+ version = "2.0.30";
src = fetchurl {
- url = "https://registry.npmjs.org/pinia/-/pinia-2.0.29.tgz";
- sha512 = "5z/KpFecq/cIgfeTnulJXldiLcTITRkTe3N58RKYSj0Pc1EdR6oyCdnf5A9jLoVwBqX5LtHhd0kGlpzWvk9oiQ==";
+ url = "https://registry.npmjs.org/pinia/-/pinia-2.0.30.tgz";
+ sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA==";
};
};
"popsicle-12.1.0" = {
@@ -8347,13 +8374,13 @@ let
sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==";
};
};
- "posthog-node-2.3.0" = {
+ "posthog-node-2.4.0" = {
name = "posthog-node";
packageName = "posthog-node";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.3.0.tgz";
- sha512 = "VV4s1DP2DTAL1WaR4Detq28epLlX2DVWfr/+itRWLvDVFyK9EDbAMqBhOkh8dd3JPkng0kcIjJ8PFII/cCXP9A==";
+ url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.4.0.tgz";
+ sha512 = "ijenljLS49AzMskyrDsmEbuPUI641I/qUEUfsVTFZYzNcmmiwWCyJu4v51DjzcH/vAda4p44CIhzL2LkROCl2Q==";
};
};
"prebuild-install-7.1.1" = {
@@ -8518,13 +8545,13 @@ let
sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==";
};
};
- "protobufjs-7.2.0" = {
+ "protobufjs-7.2.1" = {
name = "protobufjs";
packageName = "protobufjs";
- version = "7.2.0";
+ version = "7.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz";
- sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g==";
+ url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.1.tgz";
+ sha512 = "L3pCItypTnPK27+CS8nuhZMYtsY+i8dqdq2vZsYHlG17CnWp1DWPQ/sos0vOKrj1fHEAzo3GBqSHLaeZyKUCDA==";
};
};
"proxy-addr-2.0.7" = {
@@ -9454,13 +9481,13 @@ let
sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==";
};
};
- "snowflake-sdk-1.6.17" = {
+ "snowflake-sdk-1.6.18" = {
name = "snowflake-sdk";
packageName = "snowflake-sdk";
- version = "1.6.17";
+ version = "1.6.18";
src = fetchurl {
- url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.17.tgz";
- sha512 = "ui2zRPbXIK3qaW8zuQCy+mHTieN6U5yeoJmKkyhdnh/8qKOqfR9Csj5nv+bXm8Y64kG24sybtIfCzf8C9abUMQ==";
+ url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.18.tgz";
+ sha512 = "QhG1aW1VLOUf4ylwPBMsQaIsKXV0Qp2/3Da5sEq6AK8pUcXnlwZ9d2wa+4+FOtMPrpdyfe8g9/tXH+BIyze3tQ==";
};
};
"socks-2.7.1" = {
@@ -10138,6 +10165,15 @@ let
sha512 = "h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==";
};
};
+ "title-case-3.0.3" = {
+ name = "title-case";
+ packageName = "title-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz";
+ sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==";
+ };
+ };
"tlds-1.236.0" = {
name = "tlds";
packageName = "tlds";
@@ -10417,13 +10453,13 @@ let
sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw==";
};
};
- "typescript-4.9.4" = {
+ "typescript-4.9.5" = {
name = "typescript";
packageName = "typescript";
- version = "4.9.4";
+ version = "4.9.5";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz";
- sha512 = "Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==";
+ url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz";
+ sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==";
};
};
"uc.micro-1.0.6" = {
@@ -11323,10 +11359,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.213.0";
+ version = "0.214.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.213.0.tgz";
- sha512 = "O6ZOT3nhCSBXt0aA3OH64M+6UNwVO7coURqTaCI0oVwbaH387OawtKn+mVnn5Jho52hAAZAoHdF1RVal2LQtJQ==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.214.0.tgz";
+ sha512 = "nCwdAvgweOtKOg1ZAMLNoc9PgKBFPHAob3+2mw1UAqV0O+pBFcearssVMczcqiH9yr+PYkL4FKqvrPkB292Iwg==";
};
dependencies = [
(sources."@acuminous/bitsyntax-0.1.2" // {
@@ -11350,7 +11386,7 @@ in
sources."tslib-2.5.0"
];
})
- (sources."@azure/core-client-1.7.0" // {
+ (sources."@azure/core-client-1.7.1" // {
dependencies = [
sources."tslib-2.5.0"
];
@@ -11364,12 +11400,12 @@ in
];
})
sources."@azure/core-http-compat-1.3.0"
- (sources."@azure/core-lro-2.5.0" // {
+ (sources."@azure/core-lro-2.5.1" // {
dependencies = [
sources."tslib-2.5.0"
];
})
- (sources."@azure/core-paging-1.4.0" // {
+ (sources."@azure/core-paging-1.5.0" // {
dependencies = [
sources."tslib-2.5.0"
];
@@ -11433,12 +11469,12 @@ in
sources."tslib-2.5.0"
];
})
- sources."@babel/parser-7.20.13"
+ sources."@babel/parser-7.20.15"
sources."@babel/runtime-7.20.13"
sources."@codemirror/autocomplete-6.4.0"
sources."@codemirror/commands-6.2.0"
- sources."@codemirror/lang-css-6.0.1"
- sources."@codemirror/lang-javascript-6.1.2"
+ sources."@codemirror/lang-css-6.0.2"
+ sources."@codemirror/lang-javascript-6.1.3"
sources."@codemirror/language-6.4.0"
sources."@codemirror/lint-6.1.0"
sources."@codemirror/state-6.2.0"
@@ -11482,7 +11518,7 @@ in
dependencies = [
sources."@grpc/proto-loader-0.7.4"
sources."long-5.2.1"
- sources."protobufjs-7.2.0"
+ sources."protobufjs-7.2.1"
sources."yargs-16.2.0"
];
})
@@ -11504,6 +11540,11 @@ in
sources."@jridgewell/trace-mapping-0.3.9"
sources."@js-joda/core-5.5.2"
sources."@jsdevtools/ono-7.1.3"
+ sources."@jsplumb/browser-ui-5.13.2"
+ sources."@jsplumb/common-5.13.2"
+ sources."@jsplumb/connector-bezier-5.13.2"
+ sources."@jsplumb/core-5.13.2"
+ sources."@jsplumb/util-5.13.2"
sources."@kafkajs/confluent-schema-registry-1.0.6"
sources."@kwsites/file-exists-1.1.1"
sources."@kwsites/promise-deferred-1.1.1"
@@ -11512,7 +11553,7 @@ in
sources."@lezer/highlight-1.1.3"
sources."@lezer/html-1.3.0"
sources."@lezer/javascript-1.4.1"
- sources."@lezer/lr-1.3.1"
+ sources."@lezer/lr-1.3.3"
sources."@mapbox/node-pre-gyp-1.0.10"
(sources."@n8n_io/license-sdk-1.8.0" // {
dependencies = [
@@ -11529,8 +11570,8 @@ in
sources."mkdirp-1.0.4"
];
})
- sources."@oclif/command-1.8.21"
- (sources."@oclif/config-1.18.6" // {
+ sources."@oclif/command-1.8.22"
+ (sources."@oclif/config-1.18.8" // {
dependencies = [
sources."tslib-2.5.0"
];
@@ -11550,9 +11591,14 @@ in
sources."wrap-ansi-7.0.0"
];
})
- sources."@oclif/help-1.0.5"
+ (sources."@oclif/help-1.0.5" // {
+ dependencies = [
+ sources."@oclif/config-1.18.6"
+ sources."tslib-2.5.0"
+ ];
+ })
sources."@oclif/linewrap-1.0.0"
- (sources."@oclif/parser-3.8.9" // {
+ (sources."@oclif/parser-3.8.10" // {
dependencies = [
sources."tslib-2.5.0"
];
@@ -11587,15 +11633,15 @@ in
sources."domhandler-5.0.3"
];
})
- sources."@sentry/core-7.34.0"
- sources."@sentry/integrations-7.34.0"
- sources."@sentry/node-7.34.0"
- sources."@sentry/types-7.34.0"
- sources."@sentry/utils-7.34.0"
+ sources."@sentry/core-7.36.0"
+ sources."@sentry/integrations-7.36.0"
+ sources."@sentry/node-7.36.0"
+ sources."@sentry/types-7.36.0"
+ sources."@sentry/utils-7.36.0"
sources."@servie/events-1.0.0"
sources."@sqltools/formatter-1.2.5"
- sources."@swc/core-1.3.29"
- sources."@swc/wasm-1.3.29"
+ sources."@swc/core-1.3.32"
+ sources."@swc/wasm-1.3.32"
sources."@techteamer/ocsp-1.0.0"
sources."@tediousjs/connection-string-0.3.0"
sources."@tokenizer/token-0.3.0"
@@ -11723,7 +11769,7 @@ in
})
sources."available-typed-arrays-1.0.5"
sources."avsc-5.7.7"
- (sources."aws-sdk-2.1304.0" // {
+ (sources."aws-sdk-2.1308.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -11788,7 +11834,7 @@ in
sources."buffer-more-ints-1.0.0"
sources."buffer-writer-2.0.0"
sources."bufferutil-4.0.7"
- (sources."bull-4.10.2" // {
+ (sources."bull-4.10.3" // {
dependencies = [
sources."cron-parser-4.7.1"
];
@@ -11865,7 +11911,7 @@ in
})
sources."cluster-key-slot-1.1.2"
sources."codemirror-lang-html-n8n-1.0.0"
- sources."codemirror-lang-n8n-expression-0.1.0"
+ sources."codemirror-lang-n8n-expression-0.2.0"
sources."codepage-1.15.0"
(sources."color-3.2.1" // {
dependencies = [
@@ -11903,7 +11949,7 @@ in
];
})
sources."content-disposition-0.5.4"
- sources."content-type-1.0.4"
+ sources."content-type-1.0.5"
sources."convict-6.2.4"
sources."cookie-0.4.2"
(sources."cookie-parser-1.4.6" // {
@@ -12188,7 +12234,7 @@ in
sources."homedir-polyfill-1.0.3"
(sources."html-to-text-9.0.3" // {
dependencies = [
- sources."deepmerge-4.2.2"
+ sources."deepmerge-4.3.0"
sources."dom-serializer-2.0.0"
sources."domhandler-5.0.3"
sources."domutils-3.0.1"
@@ -12315,7 +12361,6 @@ in
})
sources."jsonschema-1.4.1"
sources."jsonwebtoken-9.0.0"
- sources."jsplumb-2.15.4"
sources."jsprim-1.4.2"
sources."jwa-1.4.1"
(sources."jwks-rsa-1.12.3" // {
@@ -12337,7 +12382,7 @@ in
sources."levn-0.3.0"
sources."libbase64-1.2.1"
sources."libmime-5.2.0"
- sources."libphonenumber-js-1.10.18"
+ sources."libphonenumber-js-1.10.19"
sources."libpq-1.8.12"
sources."libqp-2.0.1"
sources."lie-3.1.1"
@@ -12442,11 +12487,7 @@ in
];
})
sources."minimist-1.2.7"
- (sources."minipass-4.0.0" // {
- dependencies = [
- sources."yallist-4.0.0"
- ];
- })
+ sources."minipass-4.0.1"
(sources."minipass-collect-1.0.2" // {
dependencies = [
sources."minipass-3.3.6"
@@ -12511,7 +12552,7 @@ in
sources."mqtt-packet-6.10.0"
sources."ms-2.1.2"
sources."msal-1.4.17"
- sources."msgpackr-1.8.2"
+ sources."msgpackr-1.8.3"
(sources."mssql-8.1.4" // {
dependencies = [
sources."commander-9.5.0"
@@ -12527,7 +12568,7 @@ in
];
})
sources."mz-2.7.0"
- (sources."n8n-core-0.152.0" // {
+ (sources."n8n-core-0.153.0" // {
dependencies = [
sources."concat-stream-2.0.0"
sources."readable-stream-3.6.0"
@@ -12540,22 +12581,13 @@ in
sources."vue2-boring-avatars-0.3.8"
];
})
- (sources."n8n-editor-ui-0.179.0" // {
- dependencies = [
- sources."luxon-2.5.2"
- ];
- })
- (sources."n8n-nodes-base-0.211.0" // {
+ sources."n8n-editor-ui-0.180.0"
+ (sources."n8n-nodes-base-0.212.0" // {
dependencies = [
sources."chokidar-3.5.2"
- sources."luxon-2.3.2"
- ];
- })
- (sources."n8n-workflow-0.134.0" // {
- dependencies = [
- sources."luxon-2.3.2"
];
})
+ sources."n8n-workflow-0.135.0"
(sources."named-placeholders-1.1.3" // {
dependencies = [
sources."lru-cache-7.14.1"
@@ -12580,7 +12612,7 @@ in
sources."node-abort-controller-3.1.1"
sources."node-addon-api-4.3.0"
sources."node-ensure-0.0.0"
- sources."node-fetch-2.6.8"
+ sources."node-fetch-2.6.9"
sources."node-forge-1.3.1"
(sources."node-gyp-8.4.1" // {
dependencies = [
@@ -12728,7 +12760,7 @@ in
})
sources."picocolors-1.0.0"
sources."picomatch-2.3.1"
- sources."pinia-2.0.29"
+ sources."pinia-2.0.30"
sources."popsicle-12.1.0"
sources."popsicle-content-encoding-1.0.0"
sources."popsicle-cookie-jar-1.0.0"
@@ -12741,7 +12773,7 @@ in
sources."postgres-bytea-1.0.0"
sources."postgres-date-1.0.7"
sources."postgres-interval-1.2.0"
- (sources."posthog-node-2.3.0" // {
+ (sources."posthog-node-2.4.0" // {
dependencies = [
sources."axios-0.27.2"
];
@@ -12872,7 +12904,7 @@ in
sources."safer-buffer-2.1.2"
(sources."sanitize-html-2.7.3" // {
dependencies = [
- sources."deepmerge-4.2.2"
+ sources."deepmerge-4.3.0"
];
})
sources."sax-1.2.4"
@@ -12930,13 +12962,11 @@ in
sources."tslib-2.5.0"
];
})
- (sources."snowflake-sdk-1.6.17" // {
+ (sources."snowflake-sdk-1.6.18" // {
dependencies = [
sources."axios-0.27.2"
sources."debug-3.2.7"
- sources."jsonwebtoken-8.5.1"
sources."mkdirp-1.0.4"
- sources."semver-5.7.1"
sources."tmp-0.2.1"
sources."uuid-3.4.0"
];
@@ -13054,6 +13084,11 @@ in
sources."throwback-4.1.0"
sources."timeago.js-4.0.2"
sources."tinycolor2-1.5.2"
+ (sources."title-case-3.0.3" // {
+ dependencies = [
+ sources."tslib-2.5.0"
+ ];
+ })
sources."tlds-1.236.0"
sources."tmp-0.0.33"
(sources."tmp-promise-3.0.3" // {
@@ -13130,7 +13165,7 @@ in
];
})
sources."typeorm-aurora-data-api-driver-2.4.4"
- sources."typescript-4.9.4"
+ sources."typescript-4.9.5"
sources."uc.micro-1.0.6"
sources."uid-safe-2.1.5"
sources."unbox-primitive-1.0.2"
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index fda9d87681a9..1291caa088ff 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -27,13 +27,9 @@ stdenv.mkDerivation rec {
'${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
'';
- buildInputs = (with ocamlPackages; [
- ocaml
- camlp4
- num
- ]) ++ [
- zlib
- ];
+ strictDeps = true;
+ nativeBuildInputs = with ocamlPackages; [ ocaml camlp4];
+ buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ];
meta = {
broken = stdenv.isDarwin;
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 97ee3ed58625..c6ce7c8f593a 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -23,9 +23,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ=";
};
- nativeBuildInputs = [ makeWrapper ]
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper ocamlPackages.ocaml ]
++ lib.optional enableX11 copyDesktopItems;
- buildInputs = [ ocamlPackages.ocaml ncurses ];
+ buildInputs = [ ncurses ];
preBuild = lib.optionalString enableX11 ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 822ef3da2216..ce6988e6e61b 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -10,7 +10,14 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU=";
};
- pythonRelaxDeps = [ "cheroot" ];
+ patches = [
+ ./flask-babel.patch
+ ];
+
+ pythonRelaxDeps = [
+ "cheroot"
+ "Flask-Babel"
+ ];
nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ];
diff --git a/pkgs/applications/office/fava/flask-babel.patch b/pkgs/applications/office/fava/flask-babel.patch
new file mode 100644
index 000000000000..739be6327ca8
--- /dev/null
+++ b/pkgs/applications/office/fava/flask-babel.patch
@@ -0,0 +1,14 @@
+diff --git a/src/fava/application.py b/src/fava/application.py
+index 811c1de4..19de051a 100644
+--- a/src/fava/application.py
++++ b/src/fava/application.py
+@@ -148,8 +148,7 @@ def get_locale() -> str | None:
+ return request.accept_languages.best_match(["en"] + LANGUAGES)
+
+
+-BABEL = Babel(app)
+-BABEL.localeselector(get_locale)
++BABEL = Babel(app, locale_selector=get_locale)
+
+
+ for function in template_filters.FILTERS:
diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix
index 3d752b7d7b93..1d0c72359cfc 100644
--- a/pkgs/applications/science/logic/abella/default.nix
+++ b/pkgs/applications/science/logic/abella/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc=";
};
- buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
+ strictDeps = true;
+
+ nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index d4f0ac3e5044..c627b8a3c8f5 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -13,11 +13,19 @@ stdenv.mkDerivation {
sha256 = "sha256-W/BDhbng5iYuiB7desMKvRtDFdhoaxiJNvNvtbLlA6E=";
};
- buildInputs = [ dune_2 ] ++ (with ocamlPackages; [
- ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir menhirLib mtime sedlex yojson
- ]);
+ strictDeps = true;
- buildPhase = "dune build --profile=release";
+ nativeBuildInputs = with ocamlPackages; [ menhir ocaml findlib dune_2 ];
+
+ buildInputs = with ocamlPackages; [
+ ansiterminal cairo2 cmdliner fmt logs menhirLib mtime sedlex yojson
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+ dune build --profile=release ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+ runHook postBuild
+ '';
installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 195dd98aa3b4..f056b3e433fb 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs=";
};
- buildInputs = [ ocaml ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml ];
/* Fix up the frontend to load the 'default' cryptoverif library
** from under $out/libexec. By default, it expects to find the files
diff --git a/pkgs/applications/science/logic/ekrhyper/default.nix b/pkgs/applications/science/logic/ekrhyper/default.nix
index d6d9bb11a9a0..187cbc9a92ae 100644
--- a/pkgs/applications/science/logic/ekrhyper/default.nix
+++ b/pkgs/applications/science/logic/ekrhyper/default.nix
@@ -9,10 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM=";
};
- buildInputs = [
- ocaml
- perl
- ];
+ strictDeps = true;
+ nativeBuildInputs = [ ocaml perl ];
setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)";
preInstall = "export INSTALLDIR=$out";
postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done '';
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index e66fe992e189..4c105a40e20d 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -38,7 +38,9 @@ stdenv.mkDerivation {
})
];
- buildInputs = [ ocaml camlp5 ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml camlp5 ];
propagatedBuildInputs = [ num ];
installPhase = ''
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index ff88586e0353..6485681e3313 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8";
};
- buildInputs = [ ocaml eprover zlib ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml eprover ];
+ buildInputs = [ zlib ];
preConfigure = "patchShebangs .";
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index cbc85c5544cc..4087763aa0c5 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ eprover ocaml camlp4 perl zlib ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper eprover ocaml camlp4 perl ];
+ buildInputs = [ zlib ];
patches = [ (fetchpatch {
url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch";
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index bbc96b2b681c..a00c565fb4e0 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -11,8 +11,11 @@ stdenv.mkDerivation rec {
hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE=";
};
- nativeBuildInputs = [ pkg-config opaline ];
- buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ];
+
+ strictDeps = true;
+
+ nativeBuildInputs = [ pkg-config opaline ] ++ (with ocamlPackages; [ findlib ocaml ]);
+ buildInputs = with ocamlPackages; [ ocamlgraph ];
installTargets = "ott.install";
diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 2606b94f4bbb..4e65c018d1a2 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ ncurses ] ++ (with ocamlPackages; [
- ocaml findlib camlp5 lablgtk ]);
+ strictDeps = true;
+
+ nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]);
+ buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]);
dontAddPrefix = true;
configureFlags = [ "--prefix" "$(out)" ];
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix
index b6d15162fec3..57220aa523cf 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/pkgs/applications/science/logic/proverif/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9";
};
- buildInputs = with ocamlPackages; [ ocaml findlib ];
+ strictDeps = true;
+
+ nativeBuildInputs = with ocamlPackages; [ ocaml findlib ];
buildPhase = "./build -nointeract";
installPhase = ''
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 648ebee6550c..5e5fe9925376 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -3,8 +3,11 @@ stdenv.mkDerivation rec {
pname = "satallax";
version = "2.7";
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ ocaml zlib which eprover coq ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper ocaml which eprover coq ];
+ buildInputs = [ zlib ];
+
src = fetchurl {
url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
diff --git a/pkgs/applications/science/logic/statverif/default.nix b/pkgs/applications/science/logic/statverif/default.nix
index 07365eef33fa..1f6238977551 100644
--- a/pkgs/applications/science/logic/statverif/default.nix
+++ b/pkgs/applications/science/logic/statverif/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw";
};
- buildInputs = [ ocaml ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml ];
patchPhase = "patch -p1 < ${pf-patch}";
buildPhase = "./build";
diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix
index 14b3055ab36b..59afbc094e40 100644
--- a/pkgs/applications/science/logic/tlaplus/tlaps.nix
+++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca";
};
- buildInputs = [ ocaml isabelle cvc3 perl wget which ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml isabelle cvc3 perl wget which ];
installPhase = ''
mkdir -pv "$out"
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 8ca2a6baa889..55b59ff2e3b0 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -10,8 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I=";
};
+ strictDeps = true;
+
+ nativeBuildInputs = with ocamlPackages; [
+ ocaml findlib menhir
+ # Coq Support
+ coqPackages.coq
+ ];
+
buildInputs = with ocamlPackages; [
- ocaml findlib ocamlgraph zarith menhir
+ ocamlgraph zarith
# Emacs compilation of why3.el
emacs
# Documentation
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 75cfa2568f85..928c0b6abebc 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -29,12 +29,15 @@ let common = { version, sha256, patches ? [ ] }:
sha256 = sha256;
};
- nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
- buildInputs = [ python ]
+ strictDeps = true;
+
+ nativeBuildInputs = [ python ]
+ ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
++ optional javaBindings jdk
- ++ optionals ocamlBindings [ ocaml findlib zarith ]
+ ++ optionals ocamlBindings [ ocaml findlib ]
;
- propagatedBuildInputs = [ python.pkgs.setuptools ];
+ propagatedBuildInputs = [ python.pkgs.setuptools ]
+ ++ optionals ocamlBindings [ zarith ];
enableParallelBuilding = true;
postPatch = optionalString ocamlBindings ''
diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix
index 85ee654a989a..95c4f0f71541 100644
--- a/pkgs/applications/terminal-emulators/gnome-console/default.nix
+++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix
@@ -1,72 +1,50 @@
{ lib
, stdenv
, fetchurl
-, fetchpatch
, gettext
, gnome
, libgtop
-, gtk3
-, libhandy
+, gtk4
+, libadwaita
, pcre2
-, vte
-, appstream-glib
+, vte-gtk4
, desktop-file-utils
-, git
, meson
, ninja
, pkg-config
-, python3
-, sassc
-, wrapGAppsHook
+, wrapGAppsHook4
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "gnome-console";
- # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved!
- version = "42.2";
+ version = "43.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk=";
+ sha256 = "uWQkhaN6cOgswQVTsOJoF1a6Nh/15MvzGC8VAjH+qZ4=";
};
- patches = [
- (fetchpatch {
- name = "fix-clang-build-issues.patch";
- url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch";
- sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs=";
- })
- ];
-
- buildInputs = [
- gettext
- libgtop
- gtk3
- libhandy
- pcre2
- vte
- ];
-
nativeBuildInputs = [
- appstream-glib
desktop-file-utils
- git
+ gettext
meson
ninja
pkg-config
- python3
- sassc
- wrapGAppsHook
+ wrapGAppsHook4
];
- mesonFlags = [
- "-Dnautilus=disabled"
+ buildInputs = [
+ libgtop
+ gtk4
+ libadwaita
+ pcre2
+ vte-gtk4
];
passthru = {
updateScript = gnome.updateScript {
- packageName = pname;
+ packageName = "gnome-console";
};
};
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 20edc2af502b..2e71206aff23 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
version = "1.0.2";
pname = "monotone-viz";
- nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4];
+ nativeBuildInputs = [ pkg-config makeWrapper ocaml camlp4 ];
+ buildInputs = [ lablgtk libgnomecanvas glib graphviz_2_0 ];
src = fetchurl {
url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix
index 1c648b25ddb0..dc6f79d6a7e5 100644
--- a/pkgs/applications/virtualization/virt-top/default.nix
+++ b/pkgs/applications/virtualization/virt-top/default.nix
@@ -10,18 +10,20 @@ stdenv.mkDerivation rec {
hash = "sha256-IKIkqzx7YWki0L6D5WbwQiVWJfDFGdI2nsGgg212CcE=";
};
+ strictDeps = true;
+
nativeBuildInputs = [
autoreconfHook
pkg-config
getopt
+ ocamlPackages.ocaml
+ ocamlPackages.findlib
];
-
buildInputs = with ocamlPackages; [
+ ocamlPackages.ocaml
calendar
curses
- findlib
gettext-stub
- ocaml
ocaml_libvirt
] ++ [ libxml2 ];
diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index 2ded76d3cd4a..ce3b389b9cee 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -34,7 +34,9 @@ stdenv.mkDerivation ({
runHook postInstall
'';
-} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // {
+ strictDeps = true;
+
+} // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // {
name = "ocaml${ocaml.version}-${pname}-${version}";
diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix
index 30e0c1a8b67a..2cf22746e3c1 100644
--- a/pkgs/data/fonts/maple-font/default.nix
+++ b/pkgs/data/fonts/maple-font/default.nix
@@ -35,19 +35,27 @@ let
};
in
{
- Mono-v5 = maple-font {
+ Mono = maple-font {
pname = "MapleMono";
- version = "5.5";
- sha256 = "sha256-xkZ9NefjWHPjWNW8LGM8CgT2Zrg4j1evvx1K56sUzR8=";
+ version = "6.1";
+ sha256 = "sha256-JWyZH2F9lwWt9ROhuOtVf8HIjUAWkhCbXium0iNQry8=";
desc = "monospace";
};
- Mono-NF-v5 = maple-font {
+
+ NF = maple-font {
pname = "MapleMono-NF";
- version = "5.5";
- sha256 = "sha256-cPVGuH1CSfnRvQ4ehBvOVno7CT6Popc1Nnpcn5uJoQY=";
+ version = "6.1";
+ sha256 = "sha256-z0qoPMvowasHRK1IUMnx+lufUXqZkT3WBLtpEkP4V4I=";
desc = "Nerd Font";
};
+ SC-NF = maple-font {
+ pname = "MapleMono-SC-NF";
+ version = "6.1";
+ sha256 = "sha256-cp7pASXEiP8Td8yR+5hKpZyTST0o0pxgck4llHps4go=";
+ desc = "Nerd Font SC";
+ };
+
}
diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
index af34c6cfb766..b3e5a189135c 100644
--- a/pkgs/desktops/deepin/library/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt5integration/default.nix
@@ -17,16 +17,20 @@
stdenv.mkDerivation rec {
pname = "qt5integration";
- version = "5.6.3";
+ version = "5.6.4";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g=";
+ sha256 = "sha256-MZkhTvjTyBrlntgFq2F3iGK7WvfmnGJQLk5B1OM5kQo=";
};
- nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+ nativeBuildInputs = [
+ qmake
+ pkg-config
+ wrapQtAppsHook
+ ];
buildInputs = [
dtkwidget
diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix
index 0cb6f374f29b..ba83f42fce60 100644
--- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix
@@ -28,11 +28,11 @@
stdenv.mkDerivation rec {
pname = "gnome-maps";
- version = "43.3";
+ version = "43.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-iVUelLEnEwXP/yBLRMGDZyZ3gaV9LMt7b3u6Yo4JxRE=";
+ sha256 = "sha256-zlLVW6T2fYlu8tmZczc6iYZql7t0pLQCS23iZzx/8e8=";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix
index 67ac1cfa9708..2459c3535e97 100644
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@@ -23,6 +23,7 @@
, wrapGAppsHook
, librsvg
, webp-pixbuf-loader
+, libheif
, libexif
, gobject-introspection
, gi-docgen
@@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
extraLoaders = [
librsvg
webp-pixbuf-loader
+ libheif.out
];
}}"
'';
diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix
index 1bb1f4384b54..f5eb4c5e80df 100644
--- a/pkgs/desktops/gnome/core/zenity/default.nix
+++ b/pkgs/desktops/gnome/core/zenity/default.nix
@@ -15,13 +15,17 @@
stdenv.mkDerivation rec {
pname = "zenity";
- version = "3.43.0";
+ version = "3.44.0";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sNfKHgwYaPoY8FwhAmDYp74fCO4Tt/XP26ubYfoW+DM=";
+ sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U=";
};
+ patches = [
+ ./fix-icon-install.patch
+ ];
+
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch
new file mode 100644
index 000000000000..d412cc4a5bf0
--- /dev/null
+++ b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch
@@ -0,0 +1,12 @@
+diff --git a/data/meson.build b/data/meson.build
+index 339b3cff..aca65efd 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -9,5 +9,6 @@ install_data(
+ 'zenity-text.png',
+ 'zenity-scale.png',
+ 'zenity-entry.png',
+- 'zenity-notification.png']
++ 'zenity-notification.png'],
++ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps',
+ )
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index d084889dcac9..748869ea63c5 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fstar";
- version = "2022.11.19";
+ version = "2023.02.01";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "FStar";
rev = "v${version}";
- sha256 = "sha256-IJMzRi335RbK8mEXQaF1UDPC0JVi6zSqcz6RS874m3Q=";
+ hash = "sha256-sLhbIGF7j1tH8zKsPq1qOSwHvYDrVCyfln9UbE3IYv0=";
};
strictDeps = true;
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index 4f2b081b4db2..903fdb54fee1 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -22,7 +22,10 @@ stdenv.mkDerivation {
sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
};
- buildInputs = [ ocaml findlib ocamlbuild yojson menhir menhirLib ulex pprint fix functory ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
+ buildInputs = [ yojson menhir menhirLib ulex pprint fix functory ];
# Sets warning 3 as non-fatal
prePatch = lib.optionalString (check-ocaml-version "4.02") ''
diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix
index af895131dec9..3e13b9247fb9 100644
--- a/pkgs/development/compilers/obliv-c/default.nix
+++ b/pkgs/development/compilers/obliv-c/default.nix
@@ -1,8 +1,11 @@
{ lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
stdenv.mkDerivation rec {
pname = "obliv-c";
+
version = "0.0pre20210621";
- buildInputs = [ perl ]
+
+ strictDeps = true;
+ nativeBuildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
propagatedBuildInputs = [ libgcrypt ];
src = fetchFromGitHub {
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 6dca665ad99d..732d33608e35 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -12,19 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-etzEXbILje+CrfJxIhH7jthEMoSJdS6O33QoG8HrLvI=";
};
+ strictDeps = true;
nativeBuildInputs = [
makeWrapper
menhir
- ];
-
- buildInputs = [
+ ocaml
+ menhir
cppo
dune_3
findlib
+ ];
+
+ buildInputs = [
fix
- menhir
menhirSdk
- ocaml
ppxlib
utop
] ++ lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;
diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/development/compilers/stanc/default.nix
index e3df16230a78..b4d0c5e68230 100644
--- a/pkgs/development/compilers/stanc/default.nix
+++ b/pkgs/development/compilers/stanc/default.nix
@@ -22,9 +22,11 @@ ocamlPackages.buildDunePackage rec {
--replace "if Sys.file_exists (to_windows path) then to_windows cmd else cmd" "cmd"
'';
+ nativeBuildInputs = with ocamlPackages; [
+ menhir
+ ];
buildInputs = with ocamlPackages; [
core_unix
- menhir
menhirLib
ppx_deriving
fmt
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index fb33f92bcc2a..0e7225a184a2 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -27,8 +27,10 @@ let compcert = mkCoqDerivation rec {
"3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A=";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ];
+ strictDeps = true;
+
+ nativeBuildInputs = with ocamlPackages; [ makeWrapper ocaml findlib menhir coq coq2html ];
+ buildInputs = with ocamlPackages; [ menhirLib ];
propagatedBuildInputs = [ flocq ];
enableParallelBuilding = true;
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index 2f8d7d878a8e..eac0fcde53f6 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -1,12 +1,20 @@
{ pkgs, lib, emscripten, python3 }:
+argsFun:
+
+let
+ wrapDerivation = f:
+ pkgs.stdenv.mkDerivation (finalAttrs:
+ f (lib.toFunction argsFun finalAttrs)
+ );
+in
+wrapDerivation (
{ buildInputs ? [], nativeBuildInputs ? []
, enableParallelBuilding ? true
, meta ? {}, ... } @ args:
-pkgs.stdenv.mkDerivation (
args //
{
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index cddb773ec168..489d3b0128d9 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -15,10 +15,14 @@ stdenv.mkDerivation rec {
substituteInPlace setup.ml --replace js_of_ocaml.ocamlbuild js_of_ocaml-ocamlbuild
'';
- buildInputs = [ which ] ++ (with ocamlPackages; [
- ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild
+ strictDeps = true;
+
+ nativeBuildInputs = [ which ] ++ (with ocamlPackages; [
+ ocaml findlib ocamlbuild menhir
]);
+ buildInputs = with ocamlPackages; [ js_of_ocaml js_of_ocaml-ocamlbuild ];
+
doCheck = true;
checkTarget = "test";
diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix
index fc9fc1da08b9..9145420ad252 100644
--- a/pkgs/development/libraries/gupnp/1.6.nix
+++ b/pkgs/development/libraries/gupnp/1.6.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "gupnp";
- version = "1.6.2";
+ version = "1.6.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-6QBZzIOAXa2T6DvkflOVjwdHHMRk+UQ5HntcgqpRoY8=";
+ sha256 = "sha256-T09Biwe4EWTfH3q2EuKOTAFsLQhbik85+XlF+LFe4kg=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 37a282c4ccad..c4604a28a41e 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
+, fetchpatch2
, meson
, ninja
, pkg-config
@@ -44,13 +45,23 @@
stdenv.mkDerivation rec {
pname = "gvfs";
- version = "1.50.2";
+ version = "1.50.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "A9crjBXvQ4EQ8M9Fe1ZVJmyLUV0EErMPTVXPoNoGrF4=";
+ sha256 = "aJcRnpe7FgKdJ3jhpaVKamWSYx+LLzoqHepO8rAYA/0=";
};
+ patches = [
+ # Hardcode the ssh path again.
+ # https://gitlab.gnome.org/GNOME/gvfs/-/issues/465
+ (fetchpatch2 {
+ url = "https://gitlab.gnome.org/GNOME/gvfs/-/commit/8327383e262e1e7f32750a8a2d3dd708195b0f53.patch";
+ hash = "sha256-ReD7qkezGeiJHyo9jTqEQNBjECqGhV9nSD+dYYGZWJ8=";
+ revert = true;
+ })
+ ];
+
postPatch = ''
# patchShebangs requires executable file
chmod +x meson_post_install.py
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 34440d67818d..1eda49ad3f97 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,4 @@
{ fetchurl
-, fetchpatch
, lib
, stdenv
, meson
@@ -23,25 +22,15 @@
stdenv.mkDerivation rec {
pname = "libchamplain";
- version = "0.12.20";
+ version = "0.12.21";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2";
+ sha256 = "qRXNFyoMUpRMVXn8tGg/ioeMVxv16SglS12v78cn5ac=";
};
- patches = lib.optionals withLibsoup3 [
- # Port to libsoup3
- # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch";
- excludes = [ ".gitlab-ci.yml" ];
- sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk=";
- })
- ];
-
- outputs = [ "out" "dev" "devdoc" ];
-
nativeBuildInputs = [
meson
ninja
@@ -68,6 +57,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dgtk_doc=true"
"-Dvapi=true"
+ (lib.mesonBool "libsoup3" withLibsoup3)
];
passthru = {
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index 0af6a910a5a2..ced064e70f82 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "libhandy";
- version = "1.8.0";
+ version = "1.8.1";
outputs = [
"out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-bCVCwFeJJLDCm3rmy0TrJt846wHW1e89fQsIJXYyMOg=";
+ sha256 = "sha256-N2a5qIH+BljMYIBFOiIZCGw/bb2CBp3kCbirP1mUinA=";
};
depsBuildBuild = [
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index 8ecb6c6d96ce..5d008f394e8f 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -10,6 +10,7 @@
, libpng
, libjpeg
, libaom
+, gdk-pixbuf
# for passthru.tests
, gimp
@@ -32,11 +33,27 @@ stdenv.mkDerivation rec {
sha256 = "sha256-JwPeSNUc++z6RfMe0qAuXdekzLWR/MCmsT+Ykvp9a/s=";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
- buildInputs = [ dav1d rav1e libde265 x265 libpng libjpeg libaom ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ dav1d
+ rav1e
+ libde265
+ x265
+ libpng
+ libjpeg
+ libaom
+ gdk-pixbuf
+ ];
enableParallelBuilding = true;
+ # Fix installation path for gdk-pixbuf module
+ PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";
+
passthru.tests = {
inherit gimp imagemagick imlib2Full imv vips;
};
diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix
index f6a796f2561d..ab36b271b3ae 100644
--- a/pkgs/development/libraries/libsigcxx/3.0.nix
+++ b/pkgs/development/libraries/libsigcxx/3.0.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libsigc++";
- version = "3.2.0";
+ version = "3.4.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE=";
+ sha256 = "AuJjD/tc6TzVLDhCNSHf5wYzKIY6bpbUHXZaYRa4cH4=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index ac8dec44412d..ef73f06e34a1 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
- version = "0.12.1";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
- sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY=";
+ sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 19dfb62002e2..f0f9596f95dd 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "socket_wrapper";
- version = "1.3.4";
+ version = "1.4.0";
src = fetchurl {
url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz";
- sha256 = "sha256-dmYeXGXbe05WiT2ZDrH4aCmymDjj8SqrZyEc3d0Uf0Y=";
+ sha256 = "sha256-IGQQBSyh8hjZuymmRtU4FI2n7FyYmP28Nun9eorvAHY=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix
index c576405bb3b6..93500e17b7d4 100644
--- a/pkgs/development/libraries/tinyxml-2/default.nix
+++ b/pkgs/development/libraries/tinyxml-2/default.nix
@@ -2,17 +2,25 @@
stdenv.mkDerivation rec {
pname = "tinyxml-2";
- version = "6.0.0";
+ version = "9.0.0";
src = fetchFromGitHub {
repo = "tinyxml2";
owner = "leethomason";
rev = version;
- sha256 = "031fmhpah449h3rkyamzzdpzccrrfrvjb4qn6vx2vjm47jwc54qv";
+ sha256 = "sha256-AQQOctXi7sWIH/VOeSUClX6hlm1raEQUOp+VoPjLM14=";
};
nativeBuildInputs = [ cmake ];
+ cmakeFlags = [
+ # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
+ # (setting it to an absolute path causes include files to go to $out/$out/include,
+ # because the absolute path is interpreted with root at $out).
+ "-DCMAKE_INSTALL_INCLUDEDIR=include"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ ];
+
meta = {
description = "A simple, small, efficient, C++ XML parser";
homepage = "https://www.grinninglizard.com/tinyxml2/index.html";
diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index 32225a7bb0d8..59aa84b9518a 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -46,11 +46,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
- version = "3.4.2";
+ version = "3.4.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "EB42CPHCi/7YriVSL3pyC1WfiJp24oCvvlCk2LBk+Sw=";
+ sha256 = "jk85dkcmQbZI0PjyDeuuGxYpyltWC4YW4RfSnXVvvus=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 3a82bafa3e12..715755bb9480 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -48,6 +48,13 @@ stdenv.mkDerivation rec {
url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
})
+
+ # Fix copying text with GTK 4.
+ # https://gitlab.gnome.org/GNOME/vte/-/issues/2584
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/vte/-/commit/ddb2c8ae0baf3b73d77d1f6ce6142e92faa632af.patch";
+ hash = "sha256-5Eu0EH0MBJqJUZ6d5bVe5+hl4Z/Gd3Yltz0VAQK7ogY=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/afl-persistent/default.nix b/pkgs/development/ocaml-modules/afl-persistent/default.nix
index ba266ade830e..04d31c881561 100644
--- a/pkgs/development/ocaml-modules/afl-persistent/default.nix
+++ b/pkgs/development/ocaml-modules/afl-persistent/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "06yyds2vcwlfr2nd3gvyrazlijjcrd1abnvkfpkaadgwdw3qam1i";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib ];
# don't run tests in buildPhase
diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix
index dae42e2b97be..c52079f5ccb6 100644
--- a/pkgs/development/ocaml-modules/alcotest/lwt.nix
+++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix
@@ -10,7 +10,7 @@ buildDunePackage {
propagatedBuildInputs = [ alcotest logs lwt fmt ];
doCheck = true;
- nativeCheckInputs = [ re cmdliner ];
+ checkInputs = [ re cmdliner ];
meta = alcotest.meta // {
description = "Lwt-based helpers for Alcotest";
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 52b65817c6f8..502bd2ad44d7 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh";
};
- nativeCheckInputs = [ alcotest ppx_let ];
+ checkInputs = [ alcotest ppx_let ];
buildInputs = [ ocaml-syntax-shims ];
propagatedBuildInputs = [ bigstringaf result ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix
index c74545caf24f..fddf128d0d9b 100644
--- a/pkgs/development/ocaml-modules/apron/default.nix
+++ b/pkgs/development/ocaml-modules/apron/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp mpfr ppl camlidl ];
propagatedBuildInputs = [ mlgmpidl ];
+ # TODO: Doesn't produce the library correctly if true
strictDeps = false;
outputs = [ "out" "bin" "dev" ];
diff --git a/pkgs/development/ocaml-modules/arp/default.nix b/pkgs/development/ocaml-modules/arp/default.nix
index cdf657ea72e1..4c98f5b377bc 100644
--- a/pkgs/development/ocaml-modules/arp/default.nix
+++ b/pkgs/development/ocaml-modules/arp/default.nix
@@ -36,7 +36,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
mirage-clock-unix
mirage-profile
diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
index 720294e65e6e..8447c25cd707 100644
--- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix
+++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = with lib; {
homepage = "https://github.com/mirleft/ocaml-asn1-combinators";
diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
index a8d2ef0ace18..07ee079cae30 100644
--- a/pkgs/development/ocaml-modules/atdgen/default.nix
+++ b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -11,9 +11,8 @@ buildDunePackage {
propagatedBuildInputs = [ atdgen-runtime ];
doCheck = true;
- nativeCheckInputs = [ alcotest atdgen-codec-runtime
- (python3.withPackages (ps: [ ps.jsonschema ]))
- ];
+ nativeCheckInputs = [ atd (python3.withPackages (ps: [ ps.jsonschema ]))];
+ checkInputs = [ alcotest atdgen-codec-runtime ];
meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
description = "Generates efficient JSON serializers, deserializers and validators";
diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
index 362edaa95b1a..fd0bf82df343 100644
--- a/pkgs/development/ocaml-modules/awa/default.nix
+++ b/pkgs/development/ocaml-modules/awa/default.nix
@@ -18,8 +18,6 @@ buildDunePackage rec {
hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo=";
};
- nativeBuildInputs = [ ppx_cstruct ];
-
propagatedBuildInputs = [
mirage-crypto mirage-crypto-ec mirage-crypto-rng mirage-crypto-pk x509
cstruct cstruct-sexp sexplib mtime
@@ -27,8 +25,10 @@ buildDunePackage rec {
ppx_sexp_conv eqaf
];
+ buildInputs = [ ppx_cstruct ];
+
doCheck = true;
- nativeCheckInputs = [ cstruct-unix cmdliner fmt ];
+ checkInputs = [ cstruct-unix cmdliner fmt ];
meta = with lib; {
description = "SSH implementation in OCaml";
diff --git a/pkgs/development/ocaml-modules/awa/lwt.nix b/pkgs/development/ocaml-modules/awa/lwt.nix
index b155c1b6698c..241df784ad59 100644
--- a/pkgs/development/ocaml-modules/awa/lwt.nix
+++ b/pkgs/development/ocaml-modules/awa/lwt.nix
@@ -14,7 +14,8 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [ cstruct-unix ];
+ nativeCheckInputs = [ awa ];
+ checkInputs = [ cstruct-unix ];
meta = awa.meta // { mainProgram = "awa_lwt_server"; };
}
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 4585f731e3c6..0d2b4247bd42 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ];
- buildInputs = [ linenoise
+ buildInputs = [ ocamlbuild
+ linenoise
ounit
ppx_bitstring
z3
diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix
index 9420d3c419b5..db1a4e856467 100644
--- a/pkgs/development/ocaml-modules/base64/default.nix
+++ b/pkgs/development/ocaml-modules/base64/default.nix
@@ -11,11 +11,11 @@ buildDunePackage rec {
sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q=";
};
- propagatedBuildInputs = [ findlib ];
+ nativeBuildInputs = [ findlib ];
# otherwise fmt breaks evaluation
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ alcotest bos rresult ];
+ checkInputs = [ alcotest bos rresult ];
meta = {
homepage = "https://github.com/mirage/ocaml-base64";
diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix
index 0f5722a44acf..6c579e127184 100644
--- a/pkgs/development/ocaml-modules/benchmark/default.nix
+++ b/pkgs/development/ocaml-modules/benchmark/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ ocaml_pcre ];
- strictDeps = true;
-
createFindlibDestdir = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/bheap/default.nix b/pkgs/development/ocaml-modules/bheap/default.nix
index 7b23e23fdcea..49e5c336d90b 100644
--- a/pkgs/development/ocaml-modules/bheap/default.nix
+++ b/pkgs/development/ocaml-modules/bheap/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
useDune2 = true;
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
stdlib-shims
];
diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
index 7d6bb8806d42..2674369f37e0 100644
--- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
+++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix
@@ -14,12 +14,10 @@ buildDunePackage rec {
minimumOCamlVersion = "4.07";
useDune2 = true;
- strictDeps = !doCheck;
-
propagatedBuildInputs = [ bigarray-compat ];
nativeBuildInputs = [ findlib pkg-config ];
- nativeCheckInputs = [ alcotest astring fpath bos ];
+ checkInputs = [ alcotest astring fpath bos ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix
index bd5d470e03f4..08f50ea53e19 100644
--- a/pkgs/development/ocaml-modules/bigstringaf/default.nix
+++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@@ -13,11 +13,8 @@ buildDunePackage rec {
sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
};
- # This currently fails with dune
- strictDeps = false;
-
nativeBuildInputs = [ pkg-config ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/bindlib/default.nix b/pkgs/development/ocaml-modules/bindlib/default.nix
index 9f4cc91e2250..c0d8dd54a37b 100644
--- a/pkgs/development/ocaml-modules/bindlib/default.nix
+++ b/pkgs/development/ocaml-modules/bindlib/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4=";
};
- nativeCheckInputs = [ earley timed ];
+ checkInputs = [ earley timed ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index 22d2b643b279..2c58a4081401 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -11,8 +11,6 @@ buildDunePackage rec {
propagatedBuildInputs = [ camlp-streams easy-format ];
- strictDeps = true;
-
meta = {
description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
homepage = "https://github.com/ocaml-community/biniou";
diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix
index 35b36bc94405..006316295e49 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -1,6 +1,7 @@
{ lib, buildDunePackage, fetchFromGitHub, fetchpatch
, ounit, async, base64, camlzip, cfstream
-, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm }:
+, core, ppx_jane, ppx_sexp_conv, rresult, uri, xmlm
+}:
buildDunePackage rec {
pname = "biocaml";
@@ -10,8 +11,8 @@ buildDunePackage rec {
src = fetchFromGitHub {
owner = "biocaml";
- repo = pname;
- rev = "v${version}";
+ repo = pname;
+ rev = "v${version}";
sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s";
};
@@ -21,7 +22,7 @@ buildDunePackage rec {
};
buildInputs = [ ppx_jane ppx_sexp_conv ];
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ];
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix
index 2b9cbca2085d..9eb4c74f574c 100644
--- a/pkgs/development/ocaml-modules/bitstring/ppx.nix
+++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
buildInputs = [ bitstring ppxlib ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = bitstring.meta // {
description = "Bitstrings and bitstring matching for OCaml - PPX extension";
diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix
index a986a46f2935..25906f1432f0 100644
--- a/pkgs/development/ocaml-modules/bitv/default.nix
+++ b/pkgs/development/ocaml-modules/bitv/default.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook which ocaml findlib ];
- strictDeps = true;
-
createFindlibDestdir = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix
index 378af4109cb6..db0a383f925e 100644
--- a/pkgs/development/ocaml-modules/bls12-381-signature/default.nix
+++ b/pkgs/development/ocaml-modules/bls12-381-signature/default.nix
@@ -1,11 +1,11 @@
-{
- lib,
- fetchzip,
- buildDunePackage,
- bls12-381,
- alcotest,
- bisect_ppx,
- integers_stubs_js,
+{ lib
+, fetchzip
+, buildDunePackage
+, bls12-381
+, alcotest
+, bisect_ppx
+, integers_stubs_js
+,
}:
buildDunePackage rec {
@@ -20,7 +20,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ bls12-381 ];
- nativeCheckInputs = [alcotest bisect_ppx integers_stubs_js];
+ checkInputs = [ alcotest bisect_ppx integers_stubs_js ];
doCheck = true;
@@ -28,6 +28,6 @@ buildDunePackage rec {
description = "Implementation of BLS signatures for the pairing-friendly curve BLS12-381";
license = lib.licenses.mit;
homepage = "https://gitlab.com/nomadic-labs/cryptography/ocaml-bls12-381-signature";
- maintainers = [lib.maintainers.ulrikstrid];
+ maintainers = [ lib.maintainers.ulrikstrid ];
};
}
diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix
index b30c1333dff0..6c1ff541c5f9 100644
--- a/pkgs/development/ocaml-modules/bls12-381/default.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/default.nix
@@ -1,6 +1,7 @@
{ lib, buildDunePackage, fetchFromGitLab
, ff-sig, zarith, zarith_stubs_js, integers_stubs_js, integers, hex
-, alcotest, ff-pbt }:
+, alcotest, ff-pbt
+}:
buildDunePackage rec {
pname = "bls12-381";
@@ -23,7 +24,7 @@ buildDunePackage rec {
hex
];
- nativeCheckInputs = [ alcotest ff-pbt ];
+ checkInputs = [ alcotest ff-pbt ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/pkgs/development/ocaml-modules/bls12-381/legacy.nix
index 1ae2add21658..c72157c677e7 100644
--- a/pkgs/development/ocaml-modules/bls12-381/legacy.nix
+++ b/pkgs/development/ocaml-modules/bls12-381/legacy.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
zarith
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix
index 0c5509e08de9..aa762502a598 100644
--- a/pkgs/development/ocaml-modules/bwd/default.nix
+++ b/pkgs/development/ocaml-modules/bwd/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
};
doCheck = true;
- nativeCheckInputs = [ qcheck-core ];
+ checkInputs = [ qcheck-core ];
meta = {
description = "Backward Lists";
diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
index 73f6838501a6..1dab8e4911e0 100644
--- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
@@ -39,7 +39,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = with lib; {
description = "X.509 trust anchors extracted from Mozilla's NSS";
diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix
index 963989cb2236..185944f412e6 100644
--- a/pkgs/development/ocaml-modules/ca-certs/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
cacert # for /etc/ssl/certs/ca-bundle.crt
alcotest
fmt
diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix
index cf349eeb8bb1..8fd3f5befef9 100644
--- a/pkgs/development/ocaml-modules/calendar/default.nix
+++ b/pkgs/development/ocaml-modules/calendar/default.nix
@@ -14,8 +14,6 @@ buildDunePackage rec {
propagatedBuildInputs = [ re ];
- strictDeps = true;
-
meta = {
inherit (src.meta) homepage;
description = "A library for handling dates and times";
diff --git a/pkgs/development/ocaml-modules/callipyge/default.nix b/pkgs/development/ocaml-modules/callipyge/default.nix
index 145bcedacbcb..2004f8868caf 100644
--- a/pkgs/development/ocaml-modules/callipyge/default.nix
+++ b/pkgs/development/ocaml-modules/callipyge/default.nix
@@ -25,7 +25,7 @@ buildDunePackage rec {
# alcotest isn't available for OCaml < 4.08 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/oklm-wsh/Callipyge";
diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
index b44fd7db6b31..53115c4ecb8e 100644
--- a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
+++ b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr";
};
+ strictDeps = true;
+
nativeBuildInputs = [
omake
ocaml
@@ -65,6 +67,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
# 4.2.5 requires OCaml >= 4.06
branch = "4.2.4";
+ # incompatible with omake >= 0.10
+ broken = true;
homepage = "https://gitlab.com/camlspotter/camlimages";
description = "OCaml image processing library";
license = licenses.lgpl2Only;
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index a83c7c474ac5..b6768cfe8c1a 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -17,8 +17,6 @@ buildDunePackage rec {
sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4";
};
- strictDeps = true;
-
nativeBuildInputs = [ cppo ];
buildInputs = [ dune-configurator graphics lablgtk stdio ];
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index e5fe67021312..ea2a65393682 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -15,8 +15,6 @@ buildDunePackage rec {
nativeBuildInputs = [ cppo ];
- strictDeps = true;
-
configurePhase = ''
runHook preConfigure
ocaml configure.ml --share $out/share/camomile
diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix
index 0f37575d86d2..18b55b9857ef 100644
--- a/pkgs/development/ocaml-modules/caqti/default.nix
+++ b/pkgs/development/ocaml-modules/caqti/default.nix
@@ -1,6 +1,7 @@
{ lib, fetchurl, buildDunePackage, ocaml
, cppo, logs, ptime, uri, bigstringaf
-, re, cmdliner, alcotest }:
+, re, cmdliner, alcotest
+}:
buildDunePackage rec {
pname = "caqti";
@@ -15,7 +16,7 @@ buildDunePackage rec {
nativeBuildInputs = [ cppo ];
propagatedBuildInputs = [ logs ptime uri bigstringaf ];
- nativeCheckInputs = [ re cmdliner alcotest ];
+ checkInputs = [ re cmdliner alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix
index c3d7204f3635..727d407ac542 100644
--- a/pkgs/development/ocaml-modules/carton/default.nix
+++ b/pkgs/development/ocaml-modules/carton/default.nix
@@ -56,7 +56,7 @@ buildDunePackage rec {
nativeBuildInputs = [
findlib
];
- nativeCheckInputs = [
+ checkInputs = [
base64
alcotest
alcotest-lwt
diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix
index 60e45823eb50..03333deff67a 100644
--- a/pkgs/development/ocaml-modules/carton/lwt.nix
+++ b/pkgs/development/ocaml-modules/carton/lwt.nix
@@ -24,6 +24,8 @@ buildDunePackage {
doCheck = true;
nativeCheckInputs = [
git-binary
+ ];
+ checkInputs = [
alcotest
alcotest-lwt
cstruct
diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix
index aeedb414a3bb..b39cb471e4cb 100644
--- a/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/pkgs/development/ocaml-modules/cfstream/default.nix
@@ -17,11 +17,10 @@ buildDunePackage rec {
patches = [ ./git_commit.patch ];
- # This currently fails with dune
- strictDeps = false;
+ strictDeps = true;
nativeBuildInputs = [ m4 ];
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
propagatedBuildInputs = [ core_kernel ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix
index bad57cb9e9b4..ebd73b519f95 100644
--- a/pkgs/development/ocaml-modules/chacha/default.nix
+++ b/pkgs/development/ocaml-modules/chacha/default.nix
@@ -32,7 +32,7 @@ buildDunePackage rec {
# alcotest isn't available for OCaml < 4.05 due to fmt
doCheck = lib.versionAtLeast ocaml.version "4.05";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/abeaumont/ocaml-chacha";
diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix
index faeb905e6a7f..0b14aa57c749 100644
--- a/pkgs/development/ocaml-modules/checkseum/default.nix
+++ b/pkgs/development/ocaml-modules/checkseum/default.nix
@@ -24,7 +24,7 @@ buildDunePackage rec {
ocaml-freestanding
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
bos
astring
diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
index 1290abaa2383..f59ad1448a9f 100644
--- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix
+++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix
@@ -1,7 +1,8 @@
{ stdenv, lib, fetchFromGitLab, buildDunePackage
, gmp, pkg-config, dune-configurator
, zarith, integers
-, alcotest, bisect_ppx }:
+, alcotest, bisect_ppx
+}:
buildDunePackage rec {
pname = "class_group_vdf";
@@ -23,12 +24,16 @@ buildDunePackage rec {
dune-configurator
];
+ buildInputs = [
+ dune-configurator
+ ];
+
propagatedBuildInputs = [
zarith
integers
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
bisect_ppx
];
diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix
index bcc1c11459b2..3e6ac4ae2d96 100644
--- a/pkgs/development/ocaml-modules/cohttp/async.nix
+++ b/pkgs/development/ocaml-modules/cohttp/async.nix
@@ -51,7 +51,7 @@ buildDunePackage {
# Examples don't compile with core 0.15. See https://github.com/mirage/ocaml-cohttp/pull/864.
doCheck = false;
- nativeCheckInputs = [
+ checkInputs = [
ounit
mirage-crypto
core
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 0cb9813687a3..fcbed191ad6f 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -21,7 +21,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ base64 re stringext uri-sexp ];
doCheck = true;
- nativeCheckInputs = [ fmt alcotest crowbar ];
+ checkInputs = [ fmt alcotest crowbar ];
meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 0ff6fb6920aa..b360cf0e587e 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -14,13 +14,18 @@ buildDunePackage {
buildInputs = [ cmdliner ppx_sexp_conv ];
propagatedBuildInputs = [
- cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime
+ cohttp-lwt
+ conduit-lwt
+ conduit-lwt-unix
+ fmt
+ logs
+ magic-mime
];
# TODO(@sternenseemann): fail for unknown reason
# https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742
doCheck = false;
- nativeCheckInputs = [ ounit cacert ];
+ checkInputs = [ ounit cacert ];
meta = cohttp-lwt.meta // {
description = "CoHTTP implementation for Unix and Windows using Lwt";
diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix
index 5996cd7adb61..c9b6ad3128f3 100644
--- a/pkgs/development/ocaml-modules/coin/default.nix
+++ b/pkgs/development/ocaml-modules/coin/default.nix
@@ -24,8 +24,6 @@ buildDunePackage rec {
nativeBuildInputs = [ findlib ];
buildInputs = [ re ];
- strictDeps = true;
-
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index 3f91d9b75365..cb86ea5f4f06 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -23,7 +23,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
lwt_log
ssl
];
diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix
index 48478c963ef0..980984c6ec05 100644
--- a/pkgs/development/ocaml-modules/containers/data.nix
+++ b/pkgs/development/ocaml-modules/containers/data.nix
@@ -9,7 +9,7 @@ buildDunePackage {
inherit (containers) src version doCheck;
buildInputs = [ dune-configurator ];
- nativeCheckInputs = [ gen iter qcheck-core ];
+ checkInputs = [ gen iter qcheck-core ];
propagatedBuildInputs = [ containers ];
diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 2503ffbf08f0..4cd6413293e5 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ either seq ];
- nativeCheckInputs = [ gen iter qcheck-core uutf yojson ];
+ checkInputs = [ gen iter qcheck-core uutf yojson ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix
index a3894f0cbf4f..180a09e4d4a1 100644
--- a/pkgs/development/ocaml-modules/cooltt/default.nix
+++ b/pkgs/development/ocaml-modules/cooltt/default.nix
@@ -13,6 +13,8 @@
, uuseg
, uutf
, yuujinchou
+, ounit2
+, qcheck
}:
let
@@ -70,12 +72,13 @@ buildDunePackage {
};
nativeBuildInputs = [
- cmdliner
menhir
- ppxlib
];
- buildInputs = [ containers ];
+ buildInputs = [
+ cmdliner
+ ppxlib
+ ];
propagatedBuildInputs = [
bantorra
@@ -87,6 +90,12 @@ buildDunePackage {
uuseg
uutf
yuujinchou
+ containers
+ ];
+
+ checkInputs = [
+ ounit2
+ qcheck
];
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
index 1c898f8e75f8..4688ec4ef328 100644
--- a/pkgs/development/ocaml-modules/cow/default.nix
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -1,5 +1,6 @@
{ lib, fetchurl, buildDunePackage, ocaml, alcotest
-, uri, xmlm, omd, ezjsonm }:
+, uri, xmlm, omd, ezjsonm
+}:
buildDunePackage rec {
useDune2 = true;
@@ -14,7 +15,7 @@ buildDunePackage rec {
};
propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix
index 33702ca18296..a61a597b2093 100644
--- a/pkgs/development/ocaml-modules/cpu/default.nix
+++ b/pkgs/development/ocaml-modules/cpu/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
autoheader
'';
- buildInputs = [ autoconf ];
+ nativeBuildInputs = [ autoconf ];
hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix
index da55cb1d78a8..d321abfe9daa 100644
--- a/pkgs/development/ocaml-modules/crowbar/default.nix
+++ b/pkgs/development/ocaml-modules/crowbar/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
postPatch = "rm -rf examples/xmldiff";
propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ];
- nativeCheckInputs = [ calendar fpath pprint uutf uunf uucp ];
+ checkInputs = [ calendar fpath pprint uutf uunf uucp ];
# uunf is broken on aarch64
doCheck = !stdenv.isAarch64;
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 5ef3540a9a1e..9efe75af70c9 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
buildInputs = [ fmt ];
doCheck = true;
- nativeCheckInputs = [ alcotest crowbar ];
+ checkInputs = [ alcotest crowbar ];
meta = {
description = "Access C-like structures directly from OCaml";
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index c4518de9f9ee..b640c9745f3b 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -6,14 +6,15 @@ if lib.versionOlder (cstruct.version or "1") "3"
then cstruct
else
-buildDunePackage {
- pname = "ppx_cstruct";
- inherit (cstruct) version src meta;
+ buildDunePackage {
+ pname = "ppx_cstruct";
+ inherit (cstruct) version src meta;
- minimalOCamlVersion = "4.08";
+ minimalOCamlVersion = "4.08";
- propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
+ propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
- doCheck = true;
- nativeCheckInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ];
-}
+ doCheck = true;
+ nativeCheckInputs = [ cppo ];
+ checkInputs = [ ounit ppx_sexp_conv cstruct-sexp cstruct-unix ];
+ }
diff --git a/pkgs/development/ocaml-modules/cstruct/sexp.nix b/pkgs/development/ocaml-modules/cstruct/sexp.nix
index 091a6ab4defa..a20911cbb299 100644
--- a/pkgs/development/ocaml-modules/cstruct/sexp.nix
+++ b/pkgs/development/ocaml-modules/cstruct/sexp.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
propagatedBuildInputs = [ cstruct sexplib ];
}
diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix
index 6eb814ef7db9..edb31f1836bf 100644
--- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix
+++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix
@@ -20,10 +20,12 @@ buildDunePackage rec {
propagatedBuildInputs = [ integers_stubs_js ];
nativeCheckInputs = [
- ctypes
- js_of_ocaml-compiler
- ppx_expect
nodejs
+ js_of_ocaml-compiler
+ ];
+ checkInputs = [
+ ctypes
+ ppx_expect
];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix
index 48a776669dc3..b4cd7e458a70 100644
--- a/pkgs/development/ocaml-modules/cudf/default.nix
+++ b/pkgs/development/ocaml-modules/cudf/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-cudf";
version = "0.9";
@@ -13,15 +13,16 @@ stdenv.mkDerivation {
"all"
"opt"
];
+
nativeBuildInputs = [
findlib
ocaml
ocamlbuild
pkg-config
+ perl
];
buildInputs = [
glib
- perl
stdlib-shims
];
propagatedBuildInputs = [
@@ -32,7 +33,7 @@ stdenv.mkDerivation {
"all"
"test"
];
- nativeCheckInputs = [
+ checkInputs = [
ounit
];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix
index f82a6c237dcd..5f0e93f8f26d 100644
--- a/pkgs/development/ocaml-modules/curly/default.nix
+++ b/pkgs/development/ocaml-modules/curly/default.nix
@@ -16,7 +16,8 @@ buildDunePackage rec {
};
propagatedBuildInputs = [ result ];
- nativeCheckInputs = [ alcotest cohttp-lwt-unix cacert ];
+ nativeCheckInputs = [ cacert ];
+ checkInputs = [ alcotest cohttp-lwt-unix ];
# test dependencies are only available for >= 4.08
# https://github.com/mirage/ca-certs/issues/16
doCheck = lib.versionAtLeast ocaml.version "4.08"
diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix
index e72f4ce0e8b3..4c38d161ee61 100644
--- a/pkgs/development/ocaml-modules/curses/default.nix
+++ b/pkgs/development/ocaml-modules/curses/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0yy3wf8i7jgvzdc40bni7mvpkvclq97cgb5fw265mrjj0iqpkqpd";
};
+ strictDeps = true;
+
propagatedBuildInputs = [ ncurses ];
nativeBuildInputs = [ ocaml findlib ];
diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix
index b5878a51ef7d..7bd01ff83157 100644
--- a/pkgs/development/ocaml-modules/data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/data-encoding/default.nix
@@ -36,7 +36,7 @@ buildDunePackage {
json-data-encoding-bson
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
crowbar
ppx_expect
diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix
index c67cfac5410a..3e15bd5bbcd1 100644
--- a/pkgs/development/ocaml-modules/decompress/default.nix
+++ b/pkgs/development/ocaml-modules/decompress/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ optint checkseum ];
- nativeCheckInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ];
+ checkInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/diet/default.nix b/pkgs/development/ocaml-modules/diet/default.nix
index dc4f5214208d..cd14d2a06af5 100644
--- a/pkgs/development/ocaml-modules/diet/default.nix
+++ b/pkgs/development/ocaml-modules/diet/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ stdlib-shims ];
doCheck = true;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = with lib; {
homepage = "https://github.com/mirage/ocaml-diet";
diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix
index cca890e997f0..75ecb7fc58fb 100644
--- a/pkgs/development/ocaml-modules/digestif/default.nix
+++ b/pkgs/development/ocaml-modules/digestif/default.nix
@@ -15,12 +15,11 @@ buildDunePackage rec {
sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY=";
};
- nativeBuildInputs = [ findlib which ];
- buildInputs = [ ocaml ];
+ nativeBuildInputs = [ findlib which ocaml pkg-config ];
propagatedBuildInputs = [ eqaf ];
- nativeCheckInputs = [ alcotest astring bos fpath ];
+ checkInputs = [ alcotest astring bos fpath ];
doCheck = true;
postCheck = ''
diff --git a/pkgs/development/ocaml-modules/dispatch/default.nix b/pkgs/development/ocaml-modules/dispatch/default.nix
index e6f6ffc86492..587f5a792dc7 100644
--- a/pkgs/development/ocaml-modules/dispatch/default.nix
+++ b/pkgs/development/ocaml-modules/dispatch/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ result ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix
index dd2a8445867e..6e23eeecba97 100644
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@@ -39,7 +39,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix
index 087c0a1efa1a..e8bd210dcd8c 100644
--- a/pkgs/development/ocaml-modules/dns/client.nix
+++ b/pkgs/development/ocaml-modules/dns/client.nix
@@ -12,11 +12,28 @@ buildDunePackage {
inherit (dns) src version;
duneVersion = "3";
- propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
- lwt mirage-random mirage-time mirage-clock
- ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage
- mtime mirage-crypto-rng ];
- nativeCheckInputs = [ alcotest ];
+ propagatedBuildInputs = [
+ cstruct
+ fmt
+ logs
+ dns
+ randomconv
+ domain-name
+ ipaddr
+ lwt
+ mirage-random
+ mirage-time
+ mirage-clock
+ ca-certs
+ ca-certs-nss
+ happy-eyeballs
+ tcpip
+ tls
+ tls-mirage
+ mtime
+ mirage-crypto-rng
+ ];
+ checkInputs = [ alcotest ];
doCheck = true;
meta = dns.meta // {
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index e9ae3184b5a9..81bc741d974b 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -1,5 +1,17 @@
-{ lib, buildDunePackage, fetchurl, alcotest
-, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
+{ lib
+, buildDunePackage
+, fetchurl
+, alcotest
+, cstruct
+, domain-name
+, duration
+, gmap
+, ipaddr
+, logs
+, lru
+, metrics
+, ptime
+, fmt
, base64
}:
@@ -18,7 +30,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
description = "An Domain Name System (DNS) library";
diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix
index 3b2b0e2374ba..de2a76052384 100644
--- a/pkgs/development/ocaml-modules/dns/dnssec.nix
+++ b/pkgs/development/ocaml-modules/dns/dnssec.nix
@@ -1,6 +1,13 @@
-{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec
-, domain-name, logs
-, alcotest, base64
+{ buildDunePackage
+, cstruct
+, dns
+, mirage-crypto
+, mirage-crypto-pk
+, mirage-crypto-ec
+, domain-name
+, logs
+, alcotest
+, base64
}:
buildDunePackage {
@@ -20,7 +27,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
base64
];
diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix
index fb598746bbba..dd46a1534ed3 100644
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@@ -1,6 +1,18 @@
-{ buildDunePackage, dns, dns-server, dns-mirage, lru, duration
-, randomconv, lwt, mirage-time, mirage-clock, mirage-random
-, tcpip, tls, tls-mirage, dnssec
+{ buildDunePackage
+, dns
+, dns-server
+, dns-mirage
+, lru
+, duration
+, randomconv
+, lwt
+, mirage-time
+, mirage-clock
+, mirage-random
+, tcpip
+, tls
+, tls-mirage
+, dnssec
, alcotest
}:
@@ -28,7 +40,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix
index e10ec3830076..049cf507e3ac 100644
--- a/pkgs/development/ocaml-modules/dns/server.nix
+++ b/pkgs/development/ocaml-modules/dns/server.nix
@@ -1,6 +1,16 @@
-{ buildDunePackage, dns, dns-mirage, randomconv, duration, lwt
-, mirage-time, mirage-clock, metrics
-, alcotest, mirage-crypto-rng, dns-tsig, base64
+{ buildDunePackage
+, dns
+, dns-mirage
+, randomconv
+, duration
+, lwt
+, mirage-time
+, mirage-clock
+, metrics
+, alcotest
+, mirage-crypto-rng
+, dns-tsig
+, base64
}:
buildDunePackage {
@@ -21,7 +31,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
mirage-crypto-rng
dns-tsig
diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix
index d544e51f36f0..3ecc90d39853 100644
--- a/pkgs/development/ocaml-modules/dns/tsig.nix
+++ b/pkgs/development/ocaml-modules/dns/tsig.nix
@@ -13,7 +13,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix
index 7a7a14192f9e..b27efe501944 100644
--- a/pkgs/development/ocaml-modules/dolmen/default.nix
+++ b/pkgs/development/ocaml-modules/dolmen/default.nix
@@ -7,8 +7,6 @@ buildDunePackage rec {
pname = "dolmen";
version = "0.6";
- useDune2 = true;
-
minimalOCamlVersion = "4.08";
src = fetchurl {
@@ -16,8 +14,6 @@ buildDunePackage rec {
sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41";
};
- strictDeps = true;
-
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [ menhirLib fmt ];
diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix
index f14172fcb591..afbfbb66391b 100644
--- a/pkgs/development/ocaml-modules/domain-name/default.nix
+++ b/pkgs/development/ocaml-modules/domain-name/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.04";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix
index 8da2ed538fd7..8a36285fe697 100644
--- a/pkgs/development/ocaml-modules/domainslib/default.nix
+++ b/pkgs/development/ocaml-modules/domainslib/default.nix
@@ -1,4 +1,6 @@
-{ lib, fetchurl, buildDunePackage
+{ lib
+, fetchurl
+, buildDunePackage
, lockfree
, mirage-clock-unix
}:
@@ -18,7 +20,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ lockfree ];
doCheck = true;
- nativeCheckInputs = [ mirage-clock-unix ];
+ checkInputs = [ mirage-clock-unix ];
meta = {
homepage = "https://github.com/ocaml-multicore/domainslib";
diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix
index a59395971544..1146da5d3067 100644
--- a/pkgs/development/ocaml-modules/dose3/default.nix
+++ b/pkgs/development/ocaml-modules/dose3/default.nix
@@ -34,11 +34,13 @@ buildDunePackage rec {
];
nativeCheckInputs = [
- dpkg # Replaces: conf-dpkg
- git
- ounit
python39 # Replaces: conf-python-3
python39Packages.pyyaml # Replaces: conf-python3-yaml
+ git
+ ];
+ checkInputs = [
+ dpkg # Replaces: conf-dpkg
+ ounit
];
doCheck = false; # Tests are failing.
# To enable tests use: lib.versionAtLeast ocaml.version "4.04";
diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix
index 44bc5d7498bf..ffcfb38c6bf1 100644
--- a/pkgs/development/ocaml-modules/dtoa/default.nix
+++ b/pkgs/development/ocaml-modules/dtoa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDunePackage }:
+{ stdenv, lib, fetchurl, buildDunePackage, ounit }:
buildDunePackage rec {
pname = "dtoa";
@@ -13,6 +13,10 @@ buildDunePackage rec {
sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";
};
+ checkInputs = [ ounit ];
+
+ doCheck = true;
+
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix
index 2564d2ed0756..583949cf1da4 100644
--- a/pkgs/development/ocaml-modules/duff/default.nix
+++ b/pkgs/development/ocaml-modules/duff/default.nix
@@ -1,6 +1,12 @@
-{ lib, fetchurl, buildDunePackage, ocaml
+{ lib
+, fetchurl
+, buildDunePackage
+, ocaml
, fmt
-, alcotest, hxd, crowbar, bigstringaf
+, alcotest
+, hxd
+, crowbar
+, bigstringaf
}:
buildDunePackage rec {
@@ -15,7 +21,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [
+ checkInputs = [
alcotest
crowbar
hxd
diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix
index 5d9f105782b4..9eb7afa2c408 100644
--- a/pkgs/development/ocaml-modules/dune-build-info/default.nix
+++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, dune_2 }:
+{ lib, buildDunePackage, dune_2, dune-action-plugin }:
buildDunePackage rec {
pname = "dune-build-info";
@@ -8,6 +8,8 @@ buildDunePackage rec {
dontAddPrefix = true;
+ buildInputs = [ dune-action-plugin ];
+
meta = with lib; {
inherit (dune_2.meta) homepage;
description = "Embed build information inside executables";
diff --git a/pkgs/development/ocaml-modules/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix
index eeb974b135fb..1a1f9b07769f 100644
--- a/pkgs/development/ocaml-modules/duration/default.nix
+++ b/pkgs/development/ocaml-modules/duration/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
};
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
homepage = "https://github.com/hannesm/duration";
diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
index 08c0a284fad2..209bf30d2a61 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -22,7 +22,9 @@ buildDunePackage rec {
hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU=";
};
- buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir menhirLib path_glob ppx_deriving_yojson ];
+ nativeBuildInputs = [ menhir ];
+
+ buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ];
passthru.updateScript = gitUpdater { };
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index cc53f25b578c..1c60c963ed91 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -36,9 +36,12 @@ buildDunePackage rec {
minimalOCamlVersion = "4.04";
- buildInputs = [ perl ncurses ]
+ # atdgen is both a library and executable
+ nativeBuildInputs = [ perl camlp5 ]
++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir
++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
+ buildInputs = [ ncurses ]
+ ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen;
propagatedBuildInputs = [ re stdlib-shims ]
++ (if lib.versionAtLeast version "1.15" || version == "dev"
diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix
index c76d79d5f81b..f1c61ce27e8d 100644
--- a/pkgs/development/ocaml-modules/emile/default.nix
+++ b/pkgs/development/ocaml-modules/emile/default.nix
@@ -1,6 +1,14 @@
-{ lib, buildDunePackage, fetchurl, ocaml
-, angstrom, ipaddr, base64, pecu, uutf
-, alcotest, cmdliner
+{ lib
+, buildDunePackage
+, fetchurl
+, ocaml
+, angstrom
+, ipaddr
+, base64
+, pecu
+, uutf
+, alcotest
+, cmdliner
}:
buildDunePackage rec {
@@ -28,7 +36,7 @@ buildDunePackage rec {
# and angstrom (fmt) are only available for >= 4.08. Disabling
# tests for < 4.08 at least improves the error message
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = with lib; {
description = "Parser of email address according RFC822";
diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix
index 317446fc5ba4..7c15edabd589 100644
--- a/pkgs/development/ocaml-modules/encore/default.nix
+++ b/pkgs/development/ocaml-modules/encore/default.nix
@@ -1,5 +1,12 @@
-{ lib, buildDunePackage, fetchurl, ocaml
-, fmt, bigstringaf, angstrom, alcotest }:
+{ lib
+, buildDunePackage
+, fetchurl
+, ocaml
+, fmt
+, bigstringaf
+, angstrom
+, alcotest
+}:
buildDunePackage rec {
pname = "encore";
@@ -15,7 +22,7 @@ buildDunePackage rec {
useDune2 = true;
propagatedBuildInputs = [ angstrom fmt bigstringaf ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/ethernet/default.nix b/pkgs/development/ocaml-modules/ethernet/default.nix
index 59c581e128ae..6d76590c6ca9 100644
--- a/pkgs/development/ocaml-modules/ethernet/default.nix
+++ b/pkgs/development/ocaml-modules/ethernet/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
sha256 = "0a898vp9dw42majsvzzvs8pc6x4ns01wlwhwbacixliv6vv78ng9";
};
- nativeBuildInputs = [
+ buildInputs = [
ppx_cstruct
];
diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
index ff5ed12a998a..0dcfd5ec02de 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI=";
};
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
propagatedBuildInputs = [ bigstringaf ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix
index 4d9c69ace619..5681b33cb768 100644
--- a/pkgs/development/ocaml-modules/ff/default.nix
+++ b/pkgs/development/ocaml-modules/ff/default.nix
@@ -9,7 +9,7 @@ buildDunePackage rec {
zarith
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
ff-pbt
];
diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix
index 6c929e11b17e..ffd78381127b 100644
--- a/pkgs/development/ocaml-modules/ff/pbt.nix
+++ b/pkgs/development/ocaml-modules/ff/pbt.nix
@@ -6,7 +6,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
index e2f5fdab4f44..0431c733cb90 100644
--- a/pkgs/development/ocaml-modules/fileutils/default.nix
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
stdlib-shims
];
- nativeCheckInputs = [
+ checkInputs = [
ounit2
];
doCheck = lib.versionAtLeast ocaml.version "4.04";
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 2fae764f5dd5..837a481cf1bd 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -20,7 +20,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
doCheck = true;
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
meta = {
description = "OCaml client for google services";
diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
index 9242133ec236..ee932bffd5e6 100644
--- a/pkgs/development/ocaml-modules/gen/default.nix
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ seq ];
- nativeCheckInputs = [ qcheck ounit2 ];
+ checkInputs = [ qcheck ounit2 ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix
index ec8bbb31617d..c3bf3a2ec938 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
buildInputs = [ topkg ];
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index b078ad973f22..957d53b39644 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -32,7 +32,10 @@ buildDunePackage rec {
domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
];
nativeCheckInputs = [
- alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner
+ git-binary
+ ];
+ checkInputs = [
+ alcotest alcotest-lwt mirage-crypto-rng crowbar cmdliner
];
doCheck = !stdenv.isAarch64;
diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix
index b1e38c2ebfc9..28ce7c4a3f30 100644
--- a/pkgs/development/ocaml-modules/git/mirage.nix
+++ b/pkgs/development/ocaml-modules/git/mirage.nix
@@ -1,4 +1,5 @@
-{ lib, buildDunePackage
+{ lib
+, buildDunePackage
, git
, mimic
, mimic-happy-eyeballs
@@ -82,7 +83,7 @@ buildDunePackage {
result
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
alcotest-lwt
bigstringaf
diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix
index 65a4619ac5d8..f5e8337382e4 100644
--- a/pkgs/development/ocaml-modules/git/unix.nix
+++ b/pkgs/development/ocaml-modules/git/unix.nix
@@ -18,8 +18,11 @@ buildDunePackage {
duneVersion = "3";
buildInputs = [
- awa awa-mirage cmdliner
- mirage-clock tcpip
+ awa
+ awa-mirage
+ cmdliner
+ mirage-clock
+ tcpip
];
propagatedBuildInputs = [
rresult result bigstringaf
@@ -30,12 +33,13 @@ buildDunePackage {
tls tls-mirage git happy-eyeballs-lwt
git-mirage mirage-clock-unix
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest alcotest-lwt base64 ke
- mirage-crypto-rng git-binary
+ mirage-crypto-rng
uri mtime
cacert # sets up NIX_SSL_CERT_FILE
];
+ nativeCheckInputs = [ git-binary ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix
index 7cdddfe101de..ce13b0e1cee3 100644
--- a/pkgs/development/ocaml-modules/gmap/default.nix
+++ b/pkgs/development/ocaml-modules/gmap/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, ocaml, fetchurl, alcotest }:
+{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt }:
buildDunePackage rec {
pname = "gmap";
@@ -13,7 +13,7 @@ buildDunePackage rec {
minimumOCamlVersion = "4.03";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest fmt ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix
index b4f836215de4..b202d46abd53 100644
--- a/pkgs/development/ocaml-modules/graphql/cohttp.nix
+++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix
@@ -1,6 +1,14 @@
-{ lib, buildDunePackage, ocaml-crunch
-, astring, cohttp, digestif, graphql, ocplib-endian
-, alcotest, cohttp-lwt-unix, graphql-lwt
+{ lib
+, buildDunePackage
+, ocaml-crunch
+, astring
+, cohttp
+, digestif
+, graphql
+, ocplib-endian
+, alcotest
+, cohttp-lwt-unix
+, graphql-lwt
}:
buildDunePackage rec {
@@ -13,7 +21,7 @@ buildDunePackage rec {
nativeBuildInputs = [ ocaml-crunch ];
propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];
- nativeCheckInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ];
+ checkInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix
index b0426500b310..679d89f44b10 100644
--- a/pkgs/development/ocaml-modules/graphql/default.nix
+++ b/pkgs/development/ocaml-modules/graphql/default.nix
@@ -9,7 +9,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ graphql_parser rresult yojson ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix
index 396de94bc289..cbdcba64abb4 100644
--- a/pkgs/development/ocaml-modules/graphql/lwt.nix
+++ b/pkgs/development/ocaml-modules/graphql/lwt.nix
@@ -9,7 +9,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ graphql ocaml_lwt ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix
index 25432d9ad8a5..4042e65772bc 100644
--- a/pkgs/development/ocaml-modules/graphql/parser.nix
+++ b/pkgs/development/ocaml-modules/graphql/parser.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [ fmt re ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
index 1c3351f791df..9314c1033d4c 100644
--- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
@@ -18,7 +18,9 @@ buildDunePackage rec {
sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
};
- buildInputs = [ ppxlib ];
+ nativeBuildInputs = [ reason ];
+
+ buildInputs = [ ppxlib reason ];
propagatedBuildInputs = [
reason
@@ -26,7 +28,7 @@ buildDunePackage rec {
yojson
];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix
index 6f60330e40cc..95272890e15f 100644
--- a/pkgs/development/ocaml-modules/h2/default.nix
+++ b/pkgs/development/ocaml-modules/h2/default.nix
@@ -46,7 +46,7 @@ buildDunePackage rec {
preCheck = ''
ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case
'';
- nativeCheckInputs = [
+ checkInputs = [
alcotest
yojson
hex
diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
index d5b0691fdffa..a3a2a3cff1f9 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
@@ -13,8 +13,6 @@ buildDunePackage rec {
hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ=";
};
- strictDeps = true;
-
propagatedBuildInputs = [
domain-name
duration
diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
index 9160b9233fa5..50f1f9455739 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
@@ -19,8 +19,6 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
duneVersion = "3";
- strictDeps = true;
-
buildInputs = [
cmdliner
duration
diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
index 22f17111e44b..eb15706efac9 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
@@ -21,8 +21,6 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
duneVersion = "3";
- strictDeps = true;
-
buildInputs = [
duration
ipaddr
diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix
index b4492f438ccc..68fc506222de 100644
--- a/pkgs/development/ocaml-modules/hidapi/default.nix
+++ b/pkgs/development/ocaml-modules/hidapi/default.nix
@@ -13,8 +13,6 @@ buildDunePackage rec {
sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2";
};
- strictDeps = true;
-
minimumOCamlVersion = "4.03";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix
index 5921c6c9d359..3df9ad5307c0 100644
--- a/pkgs/development/ocaml-modules/hkdf/default.nix
+++ b/pkgs/development/ocaml-modules/hkdf/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
};
propagatedBuildInputs = [ cstruct mirage-crypto ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index 691e09a410e7..508b2e4b7f76 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
};
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
propagatedBuildInputs = [ angstrom faraday ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix
index 27ad2b5f0029..10509f1e7500 100644
--- a/pkgs/development/ocaml-modules/imagelib/default.nix
+++ b/pkgs/development/ocaml-modules/imagelib/default.nix
@@ -1,5 +1,10 @@
-{ lib, fetchurl, buildDunePackage, ocaml
-, decompress, stdlib-shims, alcotest
+{ lib
+, fetchurl
+, buildDunePackage
+, ocaml
+, decompress
+, stdlib-shims
+, alcotest
}:
buildDunePackage rec {
@@ -17,7 +22,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ decompress stdlib-shims ];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
description = "Image formats such as PNG and PPM in OCaml";
diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix
index f38d1f495f44..04373cbcce8d 100644
--- a/pkgs/development/ocaml-modules/index/default.nix
+++ b/pkgs/development/ocaml-modules/index/default.nix
@@ -31,7 +31,7 @@ buildDunePackage rec {
lru
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
crowbar
re
diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix
index 026985efcb6e..2dce9320afd4 100644
--- a/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/pkgs/development/ocaml-modules/inotify/default.nix
@@ -15,10 +15,8 @@ buildDunePackage rec {
};
buildInputs = [ lwt ];
- nativeCheckInputs = [ ounit2 fileutils ];
- # Otherwise nativeCheckInputs can't be found
- strictDeps = false;
+ checkInputs = [ ounit2 fileutils ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index 915bea6ff046..b57628222405 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }:
+{ lib, fetchurl, buildDunePackage, pkg-config, cstruct, bigarray-compat, ounit }:
buildDunePackage rec {
pname = "io-page";
@@ -11,8 +11,9 @@ buildDunePackage rec {
sha256 = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4=";
};
+ nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ cstruct bigarray-compat ];
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index 5055aa7bbbd4..c4eefb637fb5 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -10,7 +10,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ macaddr domain-name stdlib-shims ];
- nativeCheckInputs = [ ppx_sexp_conv ounit ];
+ checkInputs = [ ppx_sexp_conv ounit ];
doCheck = true;
meta = macaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
index 6f94382cf3a3..373b5a87e495 100644
--- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix
@@ -9,7 +9,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ipaddr ];
- nativeCheckInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ];
+ checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ];
doCheck = true;
meta = ipaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/irmin/chunk.nix b/pkgs/development/ocaml-modules/irmin/chunk.nix
index 39ef6b00068f..59bd81544945 100644
--- a/pkgs/development/ocaml-modules/irmin/chunk.nix
+++ b/pkgs/development/ocaml-modules/irmin/chunk.nix
@@ -8,7 +8,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ irmin fmt logs lwt ];
doCheck = true;
- nativeCheckInputs = [ alcotest irmin-test ];
+ checkInputs = [ alcotest irmin-test ];
meta = irmin.meta // {
description = "Irmin backend which allow to store values into chunks";
diff --git a/pkgs/development/ocaml-modules/irmin/containers.nix b/pkgs/development/ocaml-modules/irmin/containers.nix
index fe7eb3ffc569..73cd25f3170d 100644
--- a/pkgs/development/ocaml-modules/irmin/containers.nix
+++ b/pkgs/development/ocaml-modules/irmin/containers.nix
@@ -13,12 +13,18 @@ buildDunePackage {
];
propagatedBuildInputs = [
- irmin irmin-fs ppx_irmin lwt mtime
+ irmin
+ irmin-fs
+ ppx_irmin
+ lwt
+ mtime
];
doCheck = true;
- nativeCheckInputs = [
- alcotest alcotest-lwt cacert
+ checkInputs = [
+ alcotest
+ alcotest-lwt
+ cacert
];
meta = ppx_irmin.meta // {
diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix
index 13ae4109de06..66b572f576d6 100644
--- a/pkgs/development/ocaml-modules/irmin/default.nix
+++ b/pkgs/development/ocaml-modules/irmin/default.nix
@@ -28,7 +28,7 @@ buildDunePackage {
uutf
];
- nativeCheckInputs = [
+ checkInputs = [
vector
hex
alcotest
diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix
index 196f75ff26f0..1788cf1eda23 100644
--- a/pkgs/development/ocaml-modules/irmin/fs.nix
+++ b/pkgs/development/ocaml-modules/irmin/fs.nix
@@ -1,5 +1,6 @@
{ lib, buildDunePackage, irmin, astring, logs, lwt
-, alcotest, irmin-test, irmin-watcher }:
+, alcotest, irmin-test, irmin-watcher
+}:
buildDunePackage rec {
@@ -9,7 +10,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ irmin astring logs lwt ];
- nativeCheckInputs = [ alcotest irmin-test irmin-watcher ];
+ checkInputs = [ alcotest irmin-test irmin-watcher ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix
index b3259372860b..c48928159130 100644
--- a/pkgs/development/ocaml-modules/irmin/git.nix
+++ b/pkgs/development/ocaml-modules/irmin/git.nix
@@ -30,7 +30,7 @@ buildDunePackage {
cohttp-lwt-unix
];
- nativeCheckInputs = [ mtime alcotest irmin-test cacert ];
+ checkInputs = [ mtime alcotest irmin-test cacert ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix
index 21fe590c056b..005bf25eb2d9 100644
--- a/pkgs/development/ocaml-modules/irmin/graphql.nix
+++ b/pkgs/development/ocaml-modules/irmin/graphql.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
alcotest-lwt
logs
diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/pkgs/development/ocaml-modules/irmin/http.nix
index 5cf57fe047cc..9a466928c64a 100644
--- a/pkgs/development/ocaml-modules/irmin/http.nix
+++ b/pkgs/development/ocaml-modules/irmin/http.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ];
- nativeCheckInputs = [
+ checkInputs = [
digestif git-unix irmin-git irmin-test irmin-fs cacert
];
diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix
index 7056a2f63e6c..a1a2974a4d74 100644
--- a/pkgs/development/ocaml-modules/irmin/pack.nix
+++ b/pkgs/development/ocaml-modules/irmin/pack.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner ];
- nativeCheckInputs = [ astring alcotest alcotest-lwt irmin-test ];
+ checkInputs = [ astring alcotest alcotest-lwt irmin-test ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix
index 2e21331c22e6..83cd5b1d7f5f 100644
--- a/pkgs/development/ocaml-modules/irmin/ppx.nix
+++ b/pkgs/development/ocaml-modules/irmin/ppx.nix
@@ -11,8 +11,6 @@ buildDunePackage rec {
minimalOCamlVersion = "4.10";
- strictDeps = false; # We must provide nativeCheckInputs as buildInputs because dune builds tests at build time
-
propagatedBuildInputs = [
ppx_repr
ppxlib
diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix
index ee13bf426768..942200bf429a 100644
--- a/pkgs/development/ocaml-modules/irmin/test.nix
+++ b/pkgs/development/ocaml-modules/irmin/test.nix
@@ -27,7 +27,7 @@ buildDunePackage {
metrics
];
- nativeCheckInputs = [ hex vector ];
+ checkInputs = [ hex vector ];
meta = irmin.meta // {
description = "Irmin test suite";
diff --git a/pkgs/development/ocaml-modules/irmin/tezos.nix b/pkgs/development/ocaml-modules/irmin/tezos.nix
index 2549a783bde6..82a89daec359 100644
--- a/pkgs/development/ocaml-modules/irmin/tezos.nix
+++ b/pkgs/development/ocaml-modules/irmin/tezos.nix
@@ -9,20 +9,20 @@ buildDunePackage rec {
inherit (irmin) version src strictDeps;
propagatedBuildInputs = [
- irmin
- irmin-pack
- ppx_irmin
- digestif
- fmt
- tezos-base58
+ irmin
+ irmin-pack
+ ppx_irmin
+ digestif
+ fmt
+ tezos-base58
];
buildInputs = [
- cmdliner
- yojson
+ cmdliner
+ yojson
];
- nativeCheckInputs = [ alcotest hex irmin-test fpath ];
+ checkInputs = [ alcotest hex irmin-test fpath ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix
index 62ea8f78b45c..26adaf06d1ee 100644
--- a/pkgs/development/ocaml-modules/iter/default.nix
+++ b/pkgs/development/ocaml-modules/iter/default.nix
@@ -18,7 +18,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ result seq ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ mdx.bin ounit2 qcheck-core ];
+ nativeCheckInputs = [ mdx.bin ];
+ checkInputs = [ ounit2 qcheck-core ];
meta = {
homepage = "https://github.com/c-cube/sequence";
diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix
index d32c2027df4f..075f7c1f57d6 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -155,7 +155,7 @@ with self;
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ sexplib0 ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
};
base_bigstring = janePackage {
@@ -205,9 +205,7 @@ with self;
minimumOCamlVersion = "4.07";
meta.description = "Trivial metaprogramming tool";
propagatedBuildInputs = [ re ];
- nativeCheckInputs = [ ppx_jane ];
- # This currently fails with dune
- strictDeps = false;
+ checkInputs = [ ppx_jane ];
};
core = janePackage {
@@ -782,9 +780,7 @@ with self;
meta.description = "Yet another implementation of fork&exec and related functionality";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ textutils ];
- nativeCheckInputs = [ ounit ];
- # This currently fails with dune
- strictDeps = false;
+ checkInputs = [ ounit ];
};
shexp = janePackage {
diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix
index af040a739478..7433c116b68f 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix
@@ -177,7 +177,7 @@ with self;
meta.description = "Full standard library replacement for OCaml";
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ sexplib0 ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
};
base_bigstring = janePackage {
@@ -958,9 +958,7 @@ with self;
meta.description = "Yet another implementation of fork&exec and related functionality";
buildInputs = [ jst-config ];
propagatedBuildInputs = [ textutils ];
- nativeCheckInputs = [ ounit ];
- # This currently fails with dune
- strictDeps = false;
+ checkInputs = [ ounit ];
};
shexp = janePackage {
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index da2687576015..9552268abc2e 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -16,8 +16,6 @@ buildDunePackage (args // {
sha256 = hash;
};
- strictDeps = true;
-
meta = {
license = lib.licenses.asl20;
homepage = "https://github.com/janestreet/${pname}";
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
index 5b9186835701..d61f1b6d41c2 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
@@ -16,8 +16,6 @@ buildDunePackage (args // {
sha256 = hash;
};
- strictDeps = true;
-
meta = {
license = lib.licenses.mit;
homepage = "https://github.com/janestreet/${pname}";
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
index d124baea8972..e3c3efc9999e 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix
@@ -6,12 +6,11 @@
, minimumOCamlVersion ? "4.08"
, doCheck ? true
, buildInputs ? []
-, strictDeps ? true
, ...}@args:
buildDunePackage (args // {
useDune2 = true;
- inherit version buildInputs strictDeps;
+ inherit version buildInputs;
inherit minimumOCamlVersion;
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
index 678599089946..7306ce46bf99 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix
@@ -6,12 +6,11 @@
, minimumOCamlVersion ? "4.11"
, doCheck ? true
, buildInputs ? []
-, strictDeps ? true
, ...}@args:
buildDunePackage (args // {
useDune2 = true;
- inherit version buildInputs strictDeps;
+ inherit version buildInputs;
inherit minimumOCamlVersion;
diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix
index 3029f4084cfe..5ee48d3ed2d6 100644
--- a/pkgs/development/ocaml-modules/jingoo/default.nix
+++ b/pkgs/development/ocaml-modules/jingoo/default.nix
@@ -1,5 +1,6 @@
{ lib, buildDunePackage, fetchFromGitHub
-, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }:
+, menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2
+}:
buildDunePackage rec {
pname = "jingoo";
@@ -16,9 +17,9 @@ buildDunePackage rec {
sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA=";
};
- buildInputs = [ menhir ];
+ nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ];
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix
index a92c4839ab5d..46810ab1566b 100644
--- a/pkgs/development/ocaml-modules/json-data-encoding/bson.nix
+++ b/pkgs/development/ocaml-modules/json-data-encoding/bson.nix
@@ -10,7 +10,7 @@ buildDunePackage {
ocplib-endian
];
- nativeCheckInputs = [
+ checkInputs = [
crowbar
alcotest
];
diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
index ff3667bd79fc..13b81d9c5271 100644
--- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
uri
];
- nativeCheckInputs = [
+ checkInputs = [
crowbar
alcotest
];
diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index f8ba36d9690b..745f86dff52b 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
propagatedBuildInputs =
[ digestif fmt yojson base64 re ppx_deriving ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix
index 519b0c1725c8..243824947983 100644
--- a/pkgs/development/ocaml-modules/ke/default.nix
+++ b/pkgs/development/ocaml-modules/ke/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt ];
- nativeCheckInputs = [ alcotest bigstringaf ];
+ checkInputs = [ alcotest bigstringaf ];
doCheck = true;
minimalOCamlVersion = "4.08";
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index b010272b54b4..55dd88d7246b 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ freeglut ];
propagatedBuildInputs = [ libGLU libGL ];
diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
index bcf82e1c3842..3d5135d7439a 100644
--- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
+++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib camlp4 ];
propagatedBuildInputs = [ config-file lablgtk xmlm ];
diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
index 75b3940a1d50..66728db65566 100644
--- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib camlp4 ];
propagatedBuildInputs = [ config-file lablgtk xmlm ];
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index 4d5c4ae303e8..465c82da1210 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
inherit (param) version src;
pname = "ocaml${ocaml.version}-labltk";
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib makeWrapper ];
buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index c073ddf39cd2..a2294822a0ca 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -16,8 +16,6 @@ buildDunePackage rec {
duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "2";
- strictDeps = true;
-
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix
index f0509c243e12..1478687fe5e3 100644
--- a/pkgs/development/ocaml-modules/lambdapi/default.nix
+++ b/pkgs/development/ocaml-modules/lambdapi/default.nix
@@ -33,8 +33,8 @@ buildDunePackage rec {
bindlib camlp-streams cmdliner pratter sedlex stdlib-shims timed why3 yojson
];
- nativeCheckInputs = [ alcotest dedukti ];
- doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory")
+ checkInputs = [ alcotest dedukti ];
+ doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory")
meta = with lib; {
homepage = "https://github.com/Deducteam/lambdapi";
diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix
index ee3876d5da42..d7d0028b2c15 100644
--- a/pkgs/development/ocaml-modules/lambdasoup/default.nix
+++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ markup ];
doCheck = lib.versionAtLeast ocaml.version "4.04";
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
meta = {
description = "Functional HTML scraping and rewriting with CSS in OCaml";
diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix
index efebb5309e46..c9cd5572bc7f 100644
--- a/pkgs/development/ocaml-modules/lens/default.nix
+++ b/pkgs/development/ocaml-modules/lens/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
buildInputs = [ ppx_deriving ppxlib ];
doCheck = true;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = with lib; {
homepage = "https://github.com/pdonadeo/ocaml-lens";
diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix
index 6f14af03e5c6..13875147a4e5 100644
--- a/pkgs/development/ocaml-modules/letsencrypt/default.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix
@@ -52,7 +52,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = {
description = "ACME implementation in OCaml";
diff --git a/pkgs/development/ocaml-modules/lockfree/default.nix b/pkgs/development/ocaml-modules/lockfree/default.nix
index 6a8e871bda41..c3400d4583e0 100644
--- a/pkgs/development/ocaml-modules/lockfree/default.nix
+++ b/pkgs/development/ocaml-modules/lockfree/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ dscheck ];
doCheck = true;
- nativeCheckInputs = [ qcheck qcheck-alcotest ];
+ checkInputs = [ qcheck qcheck-alcotest ];
meta = {
description = "Lock-free data structures for multicore OCaml";
diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix
index dfa765d56493..678023bb8f3d 100644
--- a/pkgs/development/ocaml-modules/lru/default.nix
+++ b/pkgs/development/ocaml-modules/lru/default.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ psq ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ qcheck-alcotest ];
+ checkInputs = [ qcheck-alcotest ];
meta = {
homepage = "https://github.com/pqwy/lru";
diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix
index 17d21879342d..97084b913edb 100644
--- a/pkgs/development/ocaml-modules/lustre-v6/default.nix
+++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix
@@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "lustre-v6";
- version = "6.107.1";
+ version = "6.107.3";
minimalOCamlVersion = "4.12";
src = fetchurl {
- url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
- hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I=";
+ url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
+ hash = "sha256-z3cljDyxtotCGUIdYEzYu7fQd04RC3hhWpROcMh6Zng=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix
index e2df6f321fdc..da7f9ba1808f 100644
--- a/pkgs/development/ocaml-modules/luv/default.nix
+++ b/pkgs/development/ocaml-modules/luv/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
nativeBuildInputs = [ file ];
propagatedBuildInputs = [ ctypes result ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/pkgs/development/ocaml-modules/lwt-dllist/default.nix
index 12675eda9a1e..b28981b1b779 100644
--- a/pkgs/development/ocaml-modules/lwt-dllist/default.nix
+++ b/pkgs/development/ocaml-modules/lwt-dllist/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
sha256 = "e86ce75e40f00d51514cf8b2e71e5184c4cb5dae96136be24613406cfc0dba6e";
};
- nativeCheckInputs = [
+ checkInputs = [
lwt
];
doCheck = lib.versionAtLeast ocaml.version "4.03";
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 9be06c2e6112..8004cfcd4bb4 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -15,8 +15,6 @@ buildDunePackage rec {
sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE=";
};
- strictDeps = true;
-
nativeBuildInputs = [ cppo ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ libev ocplib-endian ];
diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix
index 18bc15673bd9..7eb74ff064d0 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn";
};
- nativeCheckInputs = [ ppx_sexp_conv ounit ];
+ checkInputs = [ ppx_sexp_conv ounit ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix
index 15d5602e7e03..1f03c1326a53 100644
--- a/pkgs/development/ocaml-modules/macaddr/sexp.nix
+++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix
@@ -9,7 +9,7 @@ buildDunePackage {
propagatedBuildInputs = [ ppx_sexp_conv ];
- nativeCheckInputs = [ macaddr-cstruct ounit ];
+ checkInputs = [ macaddr-cstruct ounit ];
doCheck = true;
meta = macaddr.meta // {
diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix
index 178232633552..535557c0e8df 100644
--- a/pkgs/development/ocaml-modules/markup/default.nix
+++ b/pkgs/development/ocaml-modules/markup/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ uchar uutf ];
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
doCheck = lib.versionAtLeast ocaml.version "4.04";
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix
index 4affea99510b..02ef06044457 100644
--- a/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/pkgs/development/ocaml-modules/mdx/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage, ocaml
+{ lib, fetchurl, buildDunePackage, ocaml, findlib
, alcotest
, astring, cppo, fmt, logs, ocaml-version, odoc-parser, lwt, re, csexp
, gitUpdater
@@ -17,8 +17,8 @@ buildDunePackage rec {
};
nativeBuildInputs = [ cppo ];
- propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re ];
- nativeCheckInputs = [ alcotest lwt ];
+ propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re findlib ];
+ checkInputs = [ alcotest lwt ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix
index 312169acb6cf..ddb610f5570b 100644
--- a/pkgs/development/ocaml-modules/mec/default.nix
+++ b/pkgs/development/ocaml-modules/mec/default.nix
@@ -1,6 +1,7 @@
{ lib, fetchzip, buildDunePackage, ocaml
, zarith, eqaf, bigarray-compat, hex, ff-sig, ff
-, alcotest, bisect_ppx }:
+, alcotest, bisect_ppx
+}:
buildDunePackage rec {
pname = "mec";
@@ -27,7 +28,7 @@ buildDunePackage rec {
zarith
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
bisect_ppx
];
diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix
index b295c0eda0f7..a8ccd2cf4a01 100644
--- a/pkgs/development/ocaml-modules/merlin-extend/default.nix
+++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix
@@ -11,8 +11,6 @@ buildDunePackage rec {
sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2";
};
- strictDeps = true;
-
nativeBuildInputs = [ cppo ];
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
index 837bf6c2dc96..5fcf7cf51108 100644
--- a/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -13,7 +13,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/metrics/unix.nix b/pkgs/development/ocaml-modules/metrics/unix.nix
index ef32ed3159fd..5df5e14982cc 100644
--- a/pkgs/development/ocaml-modules/metrics/unix.nix
+++ b/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -13,7 +13,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ];
- nativeCheckInputs = [ metrics-lwt ];
+ nativeCheckInputs = [ gnuplot ];
+ checkInputs = [ metrics-lwt ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix
index 1522b2def384..097ecb313534 100644
--- a/pkgs/development/ocaml-modules/mimic/default.nix
+++ b/pkgs/development/ocaml-modules/mimic/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
alcotest-lwt
bigstringaf
diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
index 940e9a779104..0d0851536b38 100644
--- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
@@ -1,5 +1,6 @@
{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, logs
-, mirage-block, ounit2, rresult, uri }:
+, mirage-block, ounit2, rresult, uri
+}:
buildDunePackage rec {
pname = "mirage-block-unix";
@@ -16,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ];
doCheck = true;
- nativeCheckInputs = [ diet ounit2 ];
+ checkInputs = [ diet ounit2 ];
meta = with lib; {
description = "MirageOS disk block driver for Unix";
diff --git a/pkgs/development/ocaml-modules/mirage-channel/default.nix b/pkgs/development/ocaml-modules/mirage-channel/default.nix
index 7461ef91daee..bdafeb430549 100644
--- a/pkgs/development/ocaml-modules/mirage-channel/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-channel/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cstruct logs lwt mirage-flow ];
doCheck = true;
- nativeCheckInputs = [ alcotest mirage-flow-combinators ];
+ checkInputs = [ alcotest mirage-flow-combinators ];
meta = {
description = "Buffered channels for MirageOS FLOW types";
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index 5bbf5d0fcb31..d5f110948dc9 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
};
doCheck = true;
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator ];
@@ -25,8 +25,6 @@ buildDunePackage rec {
ocaml-freestanding
];
- strictDeps = !doCheck;
-
meta = with lib; {
homepage = "https://github.com/mirage/mirage-crypto";
description = "Simple symmetric cryptography for the modern age";
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
index 5a9de788a5d3..3afe582413f5 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
@@ -26,7 +26,6 @@ buildDunePackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- ocaml
dune-configurator
];
propagatedBuildInputs = [
@@ -37,10 +36,10 @@ buildDunePackage rec {
ocaml-freestanding
];
- strictDeps = !doCheck;
+ strictDeps = true;
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
hex
alcotest
asn1-combinators
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
index d10e51ea0e72..b79f49c64bd4 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix
@@ -10,10 +10,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng
zarith eqaf sexplib0 ];
- strictDeps = !doCheck;
-
doCheck = true;
- nativeCheckInputs = [ ounit2 randomconv ];
+ checkInputs = [ ounit2 randomconv ];
meta = mirage-crypto.meta // {
description = "Simple public-key cryptography for the modern age";
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
index f9a244de36eb..c3703a5a60ab 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix
@@ -9,13 +9,11 @@ buildDunePackage rec {
inherit (mirage-crypto-rng) version src;
doCheck = true;
- nativeCheckInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
+ checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ];
propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime
mirage-time mirage-clock logs lwt ];
- strictDeps = !doCheck;
-
meta = mirage-crypto-rng.meta // {
description = "Entropy collection for a cryptographically secure PRNG";
};
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
index eb7e0cf0e488..044b8ed27b82 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
@@ -7,12 +7,12 @@ buildDunePackage rec {
inherit (mirage-crypto) version src;
doCheck = true;
- nativeCheckInputs = [ ounit2 randomconv ];
+ checkInputs = [ ounit2 randomconv ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ];
- strictDeps = !doCheck;
+ strictDeps = true;
meta = mirage-crypto.meta // {
description = "A cryptographically secure PRNG";
diff --git a/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/pkgs/development/ocaml-modules/mirage-flow/unix.nix
index 6a317ca34c93..023896447db1 100644
--- a/pkgs/development/ocaml-modules/mirage-flow/unix.nix
+++ b/pkgs/development/ocaml-modules/mirage-flow/unix.nix
@@ -1,5 +1,6 @@
{ buildDunePackage, fmt, logs, mirage-flow, ocaml_lwt, cstruct
-, alcotest, mirage-flow-combinators }:
+, alcotest, mirage-flow-combinators
+}:
buildDunePackage {
pname = "mirage-flow-unix";
@@ -14,7 +15,7 @@ buildDunePackage {
propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ];
doCheck = true;
- nativeCheckInputs = [ alcotest mirage-flow-combinators ];
+ checkInputs = [ alcotest mirage-flow-combinators ];
meta = mirage-flow.meta // {
description = "Flow implementations and combinators for MirageOS on Unix";
diff --git a/pkgs/development/ocaml-modules/mirage-kv/default.nix b/pkgs/development/ocaml-modules/mirage-kv/default.nix
index 771efcef2b7c..20d83e166418 100644
--- a/pkgs/development/ocaml-modules/mirage-kv/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-kv/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt mirage-device ];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
description = "MirageOS signatures for key/value devices";
diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix
index 133d49ddf9d9..7aabd51b819a 100644
--- a/pkgs/development/ocaml-modules/mirage-logs/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps";
diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix
index 0fdc6d4fa95a..fea1e712abd2 100644
--- a/pkgs/development/ocaml-modules/mirage-nat/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix
@@ -27,7 +27,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
mirage-clock-unix
];
diff --git a/pkgs/development/ocaml-modules/mirage/default.nix b/pkgs/development/ocaml-modules/mirage/default.nix
index 76f11cfd9055..410475b6b5c0 100644
--- a/pkgs/development/ocaml-modules/mirage/default.nix
+++ b/pkgs/development/ocaml-modules/mirage/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
# Tests need opam-monorepo
doCheck = false;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix
index 25062bcb0df1..8182b7b5ef53 100644
--- a/pkgs/development/ocaml-modules/mirage/runtime.nix
+++ b/pkgs/development/ocaml-modules/mirage/runtime.nix
@@ -10,7 +10,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix
index 54f137aecd8f..a2d118765616 100644
--- a/pkgs/development/ocaml-modules/mrmime/default.nix
+++ b/pkgs/development/ocaml-modules/mrmime/default.nix
@@ -62,7 +62,7 @@ buildDunePackage rec {
mirage-crypto-rng
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
jsonm
];
diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
index 8c9149c4af5a..4d44f3b97763 100644
--- a/pkgs/development/ocaml-modules/multipart-form-data/default.nix
+++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
@@ -13,13 +13,13 @@ buildDunePackage rec {
hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII=";
};
- nativeBuildInputs = [ lwt_ppx ];
+ buildInputs = [ lwt_ppx ];
propagatedBuildInputs = [ lwt stringext ];
duneVersion = "3";
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
description = "Parser for multipart/form-data (RFC2388)";
diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix
index 6fcf7757f2f9..5d4b39b21aa8 100644
--- a/pkgs/development/ocaml-modules/mustache/default.nix
+++ b/pkgs/development/ocaml-modules/mustache/default.nix
@@ -11,11 +11,12 @@ buildDunePackage rec {
sha256 = "19v8rk8d8lkfm2rmhdawfgadji6wa267ir5dprh4w9l1sfj8a1py";
};
- buildInputs = [ ezjsonm menhir ];
+ nativeBuildInputs = [ menhir ];
+ buildInputs = [ ezjsonm ];
propagatedBuildInputs = [ menhirLib ];
doCheck = true;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = {
description = "Mustache logic-less templates in OCaml";
diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix
index 61e5c70edd44..ce859d366b03 100644
--- a/pkgs/development/ocaml-modules/netchannel/default.nix
+++ b/pkgs/development/ocaml-modules/netchannel/default.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
sha256 = "sha256-kYsAf6ntwWKUp26dMcp5BScdUOaGpM46050jVZe6gfs=";
};
- nativeBuildInputs = [
+ buildInputs = [
ppx_cstruct
];
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index f0e70699ad88..2c2ffecf3dba 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
patches = [ ./META.patch ];
+ strictDeps = true;
+
nativeBuildInputs = [ pkg-config unzip ocaml automake gnum4 autoconf findlib ];
buildInputs = [ freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
index 942d69e59194..3588495884f8 100644
--- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
./configurable-binding.patch
];
+ strictDeps = true;
+
nativeBuildInputs = [
ocaml
pkg-config
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
index f99a84cf6102..e6a778194654 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
@@ -7,9 +7,9 @@ buildDunePackage {
propagatedBuildInputs = [ camomile ocaml_gettext ];
doCheck = true;
- nativeCheckInputs = [ ounit fileutils ];
+ checkInputs = [ ounit fileutils ];
- meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {
+ meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {
description = "Internationalization library using camomile (i18n)";
};
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
index bd887b4b9f56..c65f50646974 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
@@ -11,14 +11,14 @@ buildDunePackage rec {
sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb";
};
- buildInputs = [ cppo ];
+ nativeBuildInputs = [ cppo ];
propagatedBuildInputs = [ gettext fileutils ];
# Tests for version 0.4.2 are not compatible with OUnit 2.2.6
doCheck = false;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
dontStrip = true;
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
index d8999dcbae58..75e739959c3c 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
@@ -12,7 +12,7 @@ buildDunePackage rec {
doCheck = true;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];
}
diff --git a/pkgs/development/ocaml-modules/ocaml-vdom/default.nix b/pkgs/development/ocaml-modules/ocaml-vdom/default.nix
index 6ae36252aa08..72c1cb148c20 100644
--- a/pkgs/development/ocaml-modules/ocaml-vdom/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-vdom/default.nix
@@ -11,6 +11,10 @@ buildDunePackage rec {
sha256 = "sha256-FVR0WubW9VJBGVtVaXdJ+O/ghq0w5+BuItFWXkuVYL8=";
};
+ nativeBuildInputs = [
+ gen_js_api
+ ];
+
buildInputs = [
gen_js_api
];
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index aeb9c9dc699c..28f12046eaa3 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildDunePackage }:
+{ lib, fetchurl, buildDunePackage, alcotest }:
buildDunePackage rec {
pname = "ocaml-version";
@@ -9,6 +9,10 @@ buildDunePackage rec {
sha256 = "sha256-2MG+tejY67dxC19DTOZqPsi3UrHk1rqHxP4nRSvbiiU=";
};
+ checkInputs = [ alcotest ];
+
+ doCheck = true;
+
minimumOCamlVersion = "4.07";
useDune2 = true;
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 13ac62f64514..1efcbf382dbf 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -11,9 +11,6 @@ buildDunePackage rec {
sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo=";
};
- # This currently fails with dune
- strictDeps = false;
-
nativeBuildInputs = [ camlidl ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ camlidl fuse ];
diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix
index 0be4e7806630..850c29c4dc02 100644
--- a/pkgs/development/ocaml-modules/ocamlnat/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ocaml findlib ];
- buildInputs = [ ounit];
+ checkInputs = [ ounit ];
strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
index 3482aa37e750..2a33d8b17ccc 100644
--- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
};
+ strictDeps = true;
+
nativeBuildInputs = [ pkg-config ocaml findlib ];
buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl ];
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 3ee300a5a964..f4225c917dbd 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl
+{ lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib
, bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs
, cohttp, cohttp-lwt-unix, hmap
, lwt_log, ocaml_pcre, cryptokit, xml-light, ipaddr
@@ -31,7 +31,7 @@ buildDunePackage rec {
};
nativeBuildInputs = [ makeWrapper which ];
- buildInputs = [ lwt_react camlzip ];
+ buildInputs = [ lwt_react camlzip findlib ];
propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl
ocaml_pcre xml-light
diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix
index 24d2c04c6ca6..a16fbc578d33 100644
--- a/pkgs/development/ocaml-modules/odate/default.nix
+++ b/pkgs/development/ocaml-modules/odate/default.nix
@@ -15,8 +15,6 @@ buildDunePackage rec {
sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h";
};
- strictDeps = true;
-
nativeBuildInputs = [ menhir ];
# Ensure compatibility of v0.6 with menhir ≥ 20220210
diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
index 34f3e84304b7..924f643cc88d 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -16,9 +16,11 @@ buildDunePackage rec {
# dune 3 is required for tests to pass
duneVersion = if doCheck then "3" else "2";
- buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ];
+ nativeBuildInputs = [ cppo ];
+ buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ];
- nativeCheckInputs = [ markup yojson sexplib0 jq ppx_expect bash ];
+ nativeCheckInputs = [ bash jq ];
+ checkInputs = [ markup yojson sexplib0 jq ppx_expect ];
doCheck = lib.versionAtLeast ocaml.version "4.08"
&& lib.versionOlder yojson.version "2.0";
diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix
index 26632f37d206..b98d892696ec 100644
--- a/pkgs/development/ocaml-modules/opium/default.nix
+++ b/pkgs/development/ocaml-modules/opium/default.nix
@@ -49,7 +49,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest-lwt
];
diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix
index f680c3794caf..cbe02de2ef11 100644
--- a/pkgs/development/ocaml-modules/oseq/default.nix
+++ b/pkgs/development/ocaml-modules/oseq/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
duneVersion = "3";
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
containers
qcheck
];
diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix
index 3f06a098d0e1..4a2e605f4cef 100644
--- a/pkgs/development/ocaml-modules/otoml/default.nix
+++ b/pkgs/development/ocaml-modules/otoml/default.nix
@@ -19,8 +19,6 @@ buildDunePackage rec {
sha256 = "sha256-Xd3fHBN1f+tvgRFCxD/Gz8/lIvezknz7Zy3EtdqoTEM=";
};
- strictDeps = true;
-
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [ menhirLib uutf ];
diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix
index b5f707446a58..6e77b6312fa4 100644
--- a/pkgs/development/ocaml-modules/owl/default.nix
+++ b/pkgs/development/ocaml-modules/owl/default.nix
@@ -16,11 +16,14 @@ buildDunePackage rec {
inherit (owl-base) version src meta useDune2;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
buildInputs = [ dune-configurator stdio ];
propagatedBuildInputs = [
- eigen openblasCompat owl-base npy
+ eigen
+ openblasCompat
+ owl-base
+ npy
];
- doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462
+ doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462
}
diff --git a/pkgs/development/ocaml-modules/paf/cohttp.nix b/pkgs/development/ocaml-modules/paf/cohttp.nix
index 97396769fd05..2f2891493061 100644
--- a/pkgs/development/ocaml-modules/paf/cohttp.nix
+++ b/pkgs/development/ocaml-modules/paf/cohttp.nix
@@ -22,7 +22,7 @@ buildDunePackage {
inherit (paf)
version
src
- ;
+ ;
duneVersion = "3";
@@ -35,7 +35,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest-lwt
fmt
logs
diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix
index d172e73e13b2..e75efeb2ade7 100644
--- a/pkgs/development/ocaml-modules/paf/default.nix
+++ b/pkgs/development/ocaml-modules/paf/default.nix
@@ -50,7 +50,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
lwt
logs
fmt
diff --git a/pkgs/development/ocaml-modules/parse-argv/default.nix b/pkgs/development/ocaml-modules/parse-argv/default.nix
index 79a6a541a556..4bc409245eed 100644
--- a/pkgs/development/ocaml-modules/parse-argv/default.nix
+++ b/pkgs/development/ocaml-modules/parse-argv/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ astring ];
doCheck = lib.versionAtLeast ocaml.version "4.04";
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = {
description = "Process strings into sets of command-line arguments";
diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix
index 5dedd200a825..d6b9bdb7e758 100644
--- a/pkgs/development/ocaml-modules/pbkdf/default.nix
+++ b/pkgs/development/ocaml-modules/pbkdf/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ cstruct mirage-crypto ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = true;
meta = {
diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix
index aa65deff7412..ffd183787793 100644
--- a/pkgs/development/ocaml-modules/pcap-format/default.nix
+++ b/pkgs/development/ocaml-modules/pcap-format/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
sha256 = "14c5rpgglyz41jic0fg0xa22d2w1syb86kva22y9fi7aqj9vm31f";
};
- nativeBuildInputs = [
+ buildInputs = [
ppx_tools
ppx_cstruct
];
@@ -28,7 +28,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
ounit
mmap
];
diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix
index cc2827ad533d..22c1913635f8 100644
--- a/pkgs/development/ocaml-modules/pecu/default.nix
+++ b/pkgs/development/ocaml-modules/pecu/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
# crowbar availability
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ fmt alcotest crowbar astring ];
+ checkInputs = [ fmt alcotest crowbar astring ];
meta = with lib; {
description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)";
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index c8fbeb103aa4..e67429a6a45f 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -27,8 +27,9 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08";
- nativeCheckInputs = [ alcotest bppsuite ];
- buildInputs = [ menhir ];
+ nativeCheckInputs = [ bppsuite ];
+ checkInputs = [ alcotest ];
+ nativeBuildInputs = [ menhir ];
propagatedBuildInputs = [
angstrom-unix
biocaml
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index 653f86c03ac1..39ae5a86c598 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ piqi stdlib-shims ];
- nativeCheckInputs = [ num ];
+ checkInputs = [ num ];
strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix
index a63876ec5bb1..d87f6b39efb8 100644
--- a/pkgs/development/ocaml-modules/postgresql/default.nix
+++ b/pkgs/development/ocaml-modules/postgresql/default.nix
@@ -15,7 +15,8 @@ buildDunePackage rec {
sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn";
};
- buildInputs = [ dune-configurator postgresql ];
+ nativeBuildInputs = [ postgresql ];
+ buildInputs = [ dune-configurator ];
meta = {
description = "Bindings to the PostgreSQL library";
diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix
index c53b5946556c..7602d7024524 100644
--- a/pkgs/development/ocaml-modules/pp/default.nix
+++ b/pkgs/development/ocaml-modules/pp/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
useDune2 = true;
minimalOCamlVersion = "4.08";
- nativeCheckInputs = [ ppx_expect ];
+ checkInputs = [ ppx_expect ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 9bf509801bbc..6248e4e6a945 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw";
};
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
propagatedBuildInputs = [ ppxlib ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
index c58004b9adca..88f187cc706a 100644
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -42,8 +42,6 @@ buildDunePackage rec {
ctypes
];
- strictDeps = true;
-
meta = with lib; {
homepage = "https://github.com/fdopen/ppx_cstubs";
changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index dba8ffc743dd..e1c31c3ec28e 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -39,8 +39,7 @@ buildDunePackage rec {
inherit (params) sha256;
};
- # This currently fails with dune
- strictDeps = false;
+ strictDeps = true;
nativeBuildInputs = [ cppo ];
buildInputs = [ ppxlib ];
@@ -53,7 +52,7 @@ buildDunePackage rec {
];
doCheck = lib.versionOlder ocaml.version "5.0";
- nativeCheckInputs = [
+ checkInputs = [
(if lib.versionAtLeast version "5.2" then ounit2 else ounit)
];
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
index 1b48c90e1d28..5bf70a056507 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
@@ -38,7 +38,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
];
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
index ff7fc30e986c..b7d1986c30d4 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix
@@ -9,7 +9,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ];
- nativeCheckInputs = [ alcotest yojson ];
+ checkInputs = [ alcotest yojson ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
index 98872feb14f8..c6a0f6d0af65 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ppxlib ppx_deriving yaml ];
doCheck = true;
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
meta = {
description = "A YAML codec generator for OCaml";
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 87784177ed44..4fef3c0619f3 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ ppxlib ppx_deriving yojson ];
doCheck = true;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = {
description = "A Yojson codec generator for OCaml >= 4.04";
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index dca50972e3db..120ce1893b27 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -25,8 +25,6 @@ buildDunePackage rec {
pname = "ppx_import";
inherit version;
- useDune2 = true;
-
minimalOCamlVersion = "4.05";
src = fetchurl {
@@ -38,7 +36,7 @@ buildDunePackage rec {
ppxlib
];
- nativeCheckInputs = [
+ checkInputs = [
ounit
ppx_deriving
ppx_sexp_conv
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index d3af0ea154ea..2d5f73be42b8 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -58,8 +58,6 @@ then
inherit pname src meta;
inherit (param) version buildInputs nativeBuildInputs;
duneVersion = "3";
-
- strictDeps = true;
}
else
stdenv.mkDerivation {
diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix
index 339eac87beae..a44e815092ca 100644
--- a/pkgs/development/ocaml-modules/pratter/default.nix
+++ b/pkgs/development/ocaml-modules/pratter/default.nix
@@ -22,7 +22,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ camlp-streams ];
- nativeCheckInputs = [ alcotest qcheck qcheck-alcotest ];
+ checkInputs = [ alcotest qcheck qcheck-alcotest ];
doCheck = true;
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/prettym/default.nix b/pkgs/development/ocaml-modules/prettym/default.nix
index 7cdbc7b05bbe..d19233cf13c9 100644
--- a/pkgs/development/ocaml-modules/prettym/default.nix
+++ b/pkgs/development/ocaml-modules/prettym/default.nix
@@ -31,7 +31,7 @@ buildDunePackage rec {
ke
];
- nativeCheckInputs = [
+ checkInputs = [
ptime
alcotest
jsonm
diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix
index 35c7ee9eb43c..4c00ff98465a 100644
--- a/pkgs/development/ocaml-modules/progress/default.nix
+++ b/pkgs/development/ocaml-modules/progress/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt logs mtime optint terminal vector ];
doCheck = true;
- nativeCheckInputs = [ alcotest astring ];
+ checkInputs = [ alcotest astring ];
meta = with lib; {
description = "Progress bar library for OCaml";
diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index 1cb14f75faa8..ef88bdcdab7b 100644
--- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -13,8 +13,6 @@ buildDunePackage rec {
minimalOCamlVersion = "4.03";
- strictDeps = true;
-
nativeBuildInputs = [ menhir ];
meta = {
diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix
index 75b234472849..ea9a0615b414 100644
--- a/pkgs/development/ocaml-modules/psq/default.nix
+++ b/pkgs/development/ocaml-modules/psq/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ seq ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ qcheck-alcotest ];
+ checkInputs = [ qcheck-alcotest ];
meta = {
description = "Functional Priority Search Queues for OCaml";
diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix
index a3c0eb55f968..edc9e1c6dcbd 100644
--- a/pkgs/development/ocaml-modules/ptmap/default.nix
+++ b/pkgs/development/ocaml-modules/ptmap/default.nix
@@ -14,8 +14,6 @@ buildDunePackage rec {
sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb";
};
- strictDeps = true;
-
buildInputs = [ stdlib-shims ];
propagatedBuildInputs = [ seq ];
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index 3aafd9807a01..49b1357f5491 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -15,8 +15,6 @@ buildDunePackage rec {
propagatedBuildInputs = [ react ];
- strictDeps = true;
-
meta = with lib; {
description = "An OCaml module for functional reactive programming (FRP) based on React";
homepage = "https://github.com/ocsigen/reactiveData";
diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix
index b4d6708467f0..3e517591b9e6 100644
--- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix
+++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix
@@ -4,6 +4,7 @@
pname = "refmterr";
nativeBuildInputs = [
+ atdgen
reason
];
diff --git a/pkgs/development/ocaml-modules/repr/ppx.nix b/pkgs/development/ocaml-modules/repr/ppx.nix
index eb96298f16ae..1eb762563621 100644
--- a/pkgs/development/ocaml-modules/repr/ppx.nix
+++ b/pkgs/development/ocaml-modules/repr/ppx.nix
@@ -12,7 +12,7 @@ buildDunePackage {
];
doCheck = false; # tests fail with ppxlib >= 0.23.0
- nativeCheckInputs = [
+ checkInputs = [
alcotest
hex
];
diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix
index 432636bcbb5f..40356ec9aa5f 100644
--- a/pkgs/development/ocaml-modules/rfc7748/default.nix
+++ b/pkgs/development/ocaml-modules/rfc7748/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
# the tests fail for 4.05
doCheck = lib.versionAtLeast ocaml.version "4.06";
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
meta = {
homepage = "https://github.com/burgerdev/ocaml-rfc7748";
diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix
index 34f62852a81a..73d899eafa93 100644
--- a/pkgs/development/ocaml-modules/rpclib/default.nix
+++ b/pkgs/development/ocaml-modules/rpclib/default.nix
@@ -16,7 +16,7 @@ buildDunePackage rec {
buildInputs = [ cmdliner yojson ];
propagatedBuildInputs = [ base64 rresult xmlm ];
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix
index 69b2bf749908..1f97d7ff52d2 100644
--- a/pkgs/development/ocaml-modules/rpclib/lwt.nix
+++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix
@@ -1,6 +1,10 @@
-{ lib, buildDunePackage, rpclib
+{ lib
+, buildDunePackage
+, rpclib
, lwt
-, alcotest-lwt, ppx_deriving_rpc, yojson
+, alcotest-lwt
+, ppx_deriving_rpc
+, yojson
}:
buildDunePackage {
@@ -9,7 +13,7 @@ buildDunePackage {
propagatedBuildInputs = [ lwt rpclib ];
- nativeCheckInputs = [ alcotest-lwt ppx_deriving_rpc yojson ];
+ checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ];
doCheck = true;
meta = rpclib.meta // {
diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
index f08f77c5282f..4a9a761ab30c 100644
--- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
@@ -31,7 +31,7 @@ buildDunePackage rec {
dune-configurator
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
hex
];
diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix
index d809678838ab..4d400d32844a 100644
--- a/pkgs/development/ocaml-modules/sha/default.nix
+++ b/pkgs/development/ocaml-modules/sha/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
ounit2
];
diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
index 2e4b656e638f..0b4974f910c9 100644
--- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
sha256 = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU=";
};
- nativeBuildInputs = [
+ buildInputs = [
ppx_cstruct
];
@@ -28,7 +28,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
ounit
];
diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
index 75d62dd15a79..e3ae1ef2e3dc 100644
--- a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
+++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix
@@ -27,7 +27,7 @@ buildDunePackage {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
ounit
];
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index 7730a5a62bae..7eca606f93fc 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -24,7 +24,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ openssl ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
preCheck = ''
mkdir -p _build/default/tests/
cp tests/digicert_certificate.pem _build/default/tests/
diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix
index b8dcc81bfe7e..33e93967e192 100644
--- a/pkgs/development/ocaml-modules/stdcompat/default.nix
+++ b/pkgs/development/ocaml-modules/stdcompat/default.nix
@@ -12,8 +12,6 @@ buildDunePackage rec {
sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
};
- strictDeps = true;
-
# Otherwise ./configure script will run and create files conflicting with dune.
dontConfigure = true;
diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix
index 5abcdc3dcfa2..cec0ec818300 100644
--- a/pkgs/development/ocaml-modules/stdint/default.nix
+++ b/pkgs/development/ocaml-modules/stdint/default.nix
@@ -26,7 +26,7 @@ buildDunePackage rec {
'';
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ qcheck ];
+ checkInputs = [ qcheck ];
meta = {
description = "Various signed and unsigned integers for OCaml";
diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix
index 95b01e5d8fed..3d440cf48959 100644
--- a/pkgs/development/ocaml-modules/stringext/default.nix
+++ b/pkgs/development/ocaml-modules/stringext/default.nix
@@ -14,7 +14,7 @@ buildDunePackage {
sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv";
};
- nativeCheckInputs = [ ounit qtest ];
+ checkInputs = [ ounit qtest ];
inherit doCheck;
meta = {
diff --git a/pkgs/development/ocaml-modules/syslog-message/default.nix b/pkgs/development/ocaml-modules/syslog-message/default.nix
index 4e5ab303f5c5..2c12415cdbb2 100644
--- a/pkgs/development/ocaml-modules/syslog-message/default.nix
+++ b/pkgs/development/ocaml-modules/syslog-message/default.nix
@@ -23,7 +23,7 @@ buildDunePackage rec {
];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [
+ checkInputs = [
qcheck
];
diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix
index a388bea4e867..0cd57ba9c8ff 100644
--- a/pkgs/development/ocaml-modules/tcpip/default.nix
+++ b/pkgs/development/ocaml-modules/tcpip/default.nix
@@ -23,12 +23,12 @@ buildDunePackage rec {
};
nativeBuildInputs = [
- bisect_ppx
- ppx_cstruct
pkg-config
];
propagatedBuildInputs = [
+ bisect_ppx
+ ppx_cstruct
rresult
cstruct
cstruct-lwt
@@ -58,7 +58,7 @@ buildDunePackage rec {
];
doCheck = false;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
mirage-flow
mirage-vnetif
diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix
index fa18ce227155..e97fb223e415 100644
--- a/pkgs/development/ocaml-modules/terminal/default.nix
+++ b/pkgs/development/ocaml-modules/terminal/default.nix
@@ -18,7 +18,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ stdlib-shims uutf uucp ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
- nativeCheckInputs = [ alcotest fmt ];
+ checkInputs = [ alcotest fmt ];
meta = with lib; {
description = "Basic utilities for interacting with terminals";
diff --git a/pkgs/development/ocaml-modules/terminal_size/default.nix b/pkgs/development/ocaml-modules/terminal_size/default.nix
index 564b69505d7c..fa6bd003eaec 100644
--- a/pkgs/development/ocaml-modules/terminal_size/default.nix
+++ b/pkgs/development/ocaml-modules/terminal_size/default.nix
@@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7";
};
- nativeCheckInputs = [ alcotest ];
+ checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix
index 03c2ecca4052..47f9253e4473 100644
--- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix
+++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix
@@ -1,14 +1,14 @@
-{
- lib,
- fetchFromGitLab,
- buildDunePackage,
- bls12-381,
- data-encoding,
- bigstringaf,
- alcotest,
- alcotest-lwt,
- bisect_ppx,
- qcheck-alcotest,
+{ lib
+, fetchFromGitLab
+, buildDunePackage
+, bls12-381
+, data-encoding
+, bigstringaf
+, alcotest
+, alcotest-lwt
+, bisect_ppx
+, qcheck-alcotest
+,
}:
buildDunePackage rec {
@@ -22,9 +22,9 @@ buildDunePackage rec {
sha256 = "sha256-H1Wog3GItTIVsawr9JkyyKq+uGqbTQPTR1dacpmxLbs=";
};
- propagatedBuildInputs = [bls12-381 data-encoding bigstringaf];
+ propagatedBuildInputs = [ bls12-381 data-encoding bigstringaf ];
- nativeCheckInputs = [alcotest alcotest-lwt bisect_ppx qcheck-alcotest];
+ checkInputs = [ alcotest alcotest-lwt bisect_ppx qcheck-alcotest ];
doCheck = false; # circular dependencies
@@ -32,6 +32,6 @@ buildDunePackage rec {
description = "Polynomials over BLS12-381 finite field";
license = lib.licenses.mit;
homepage = "https://gitlab.com/nomadic-labs/privacy-team";
- maintainers = [lib.maintainers.ulrikstrid];
+ maintainers = [ lib.maintainers.ulrikstrid ];
};
}
diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix
index 3eed3652e5f5..0f618f0d1e6b 100644
--- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix
+++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix
@@ -30,7 +30,7 @@ buildDunePackage rec {
mec
];
- nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ];
+ checkInputs = [ alcotest qcheck-alcotest bisect_ppx ];
doCheck = false; # circular deps
diff --git a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix
index c602e8a3b0e2..f9b78e11d332 100644
--- a/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix
+++ b/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix
@@ -1,14 +1,14 @@
-{
- lib,
- buildDunePackage,
- hacl-star,
- bls12-381,
- tezos-bls12-381-polynomial,
- data-encoding,
- tezos-plompiler,
- alcotest,
- qcheck-alcotest,
- bisect_ppx,
+{ lib
+, buildDunePackage
+, hacl-star
+, bls12-381
+, tezos-bls12-381-polynomial
+, data-encoding
+, tezos-plompiler
+, alcotest
+, qcheck-alcotest
+, bisect_ppx
+,
}:
buildDunePackage rec {
@@ -25,7 +25,7 @@ buildDunePackage rec {
tezos-plompiler
];
- nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ];
+ checkInputs = [ alcotest qcheck-alcotest bisect_ppx ];
doCheck = false; # broken
diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix
index a0c22b5026b4..b68edba2728e 100644
--- a/pkgs/development/ocaml-modules/tls/default.nix
+++ b/pkgs/development/ocaml-modules/tls/default.nix
@@ -38,7 +38,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
alcotest
cstruct-unix
ounit2
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index a7d1f573c69a..354a8ca2098a 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
sha256 = "sha256-GqFz+bYG2ESkAEJyP8DKud4JFfU5MGLulzJa5Z4sptQ=";
};
+ strictDeps = true;
+
nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ];
buildInputs = [ topkg ];
propagatedBuildInputs = [ SDL2 ctypes ]
diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix
index 11ee8eb6b5eb..efb86d862476 100644
--- a/pkgs/development/ocaml-modules/uecc/default.nix
+++ b/pkgs/development/ocaml-modules/uecc/default.nix
@@ -15,7 +15,7 @@ buildDunePackage rec {
bigstring
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
cstruct
hex
diff --git a/pkgs/development/ocaml-modules/unstrctrd/default.nix b/pkgs/development/ocaml-modules/unstrctrd/default.nix
index b3cb4933b917..104cabfd0fae 100644
--- a/pkgs/development/ocaml-modules/unstrctrd/default.nix
+++ b/pkgs/development/ocaml-modules/unstrctrd/default.nix
@@ -28,7 +28,7 @@ buildDunePackage rec {
uutf
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest
bigstringaf
crowbar
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index fa659699cb70..f669a98c4def 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65";
};
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
propagatedBuildInputs = [ angstrom stringext ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix
index 9cb66139fb8e..ba970b1d6c51 100644
--- a/pkgs/development/ocaml-modules/uri/sexp.nix
+++ b/pkgs/development/ocaml-modules/uri/sexp.nix
@@ -8,7 +8,7 @@ buildDunePackage {
pname = "uri-sexp";
inherit (uri) version useDune2 src meta;
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
}
diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index cfadc9e5fb37..476a4529f3fe 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
${topkg.run} test
runHook postCheck
'';
- nativeCheckInputs = [ uucd ];
+ checkInputs = [ uucd ];
meta = with lib; {
description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index 0ead92d9c54b..bece082f6418 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM=";
};
+ strictDeps = true;
+
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
configurePlatforms = [];
buildInputs = [ topkg cmdliner ];
diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix
index 8f4b4eadaed1..4473cd8217c0 100644
--- a/pkgs/development/ocaml-modules/uuuu/default.nix
+++ b/pkgs/development/ocaml-modules/uuuu/default.nix
@@ -25,8 +25,6 @@ buildDunePackage rec {
buildInputs = [ angstrom ];
- strictDeps = !doCheck;
-
nativeCheckInputs = [ re ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/vchan/default.nix b/pkgs/development/ocaml-modules/vchan/default.nix
index 703743250864..872d11606ff6 100644
--- a/pkgs/development/ocaml-modules/vchan/default.nix
+++ b/pkgs/development/ocaml-modules/vchan/default.nix
@@ -15,11 +15,8 @@ buildDunePackage rec {
sha256 = "sha256-5E7dITMVirYoxUkp8ZamRAolyhA6avXGJNAioxeBuV0=";
};
- nativeBuildInputs = [
- ppx_cstruct
- ];
-
propagatedBuildInputs = [
+ ppx_cstruct
ppx_sexp_conv
lwt
cstruct
@@ -31,7 +28,7 @@ buildDunePackage rec {
];
doCheck = true;
- nativeCheckInputs = [
+ checkInputs = [
cmdliner
ounit
];
diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix
index 95c0c4a9dc42..f7ade2ec8070 100644
--- a/pkgs/development/ocaml-modules/wayland/default.nix
+++ b/pkgs/development/ocaml-modules/wayland/default.nix
@@ -33,7 +33,7 @@ buildDunePackage rec {
xmlm
];
- nativeCheckInputs = [
+ checkInputs = [
alcotest-lwt
];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index c6335ba8a939..9f8749cac9fd 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -19,7 +19,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ cohttp dispatch ptime ];
- nativeCheckInputs = [ ounit ];
+ checkInputs = [ ounit ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index 9bfe9489444c..bd7a7a0fa47c 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -17,7 +17,7 @@ buildDunePackage rec {
hash = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I=";
};
- nativeCheckInputs = [ alcotest cstruct-unix ];
+ checkInputs = [ alcotest cstruct-unix ];
propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix
index a60341f569ce..a3f4e0abcdef 100644
--- a/pkgs/development/ocaml-modules/xenstore/default.nix
+++ b/pkgs/development/ocaml-modules/xenstore/default.nix
@@ -13,11 +13,11 @@ buildDunePackage rec {
hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0=";
};
- nativeBuildInputs = [ ppx_cstruct ];
+ buildInputs = [ ppx_cstruct ];
propagatedBuildInputs = [ cstruct lwt ];
doCheck = true;
- nativeCheckInputs = [ ounit2 ];
+ checkInputs = [ ounit2 ];
meta = with lib; {
description = "Xenstore protocol in pure OCaml";
diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix
index 401b7ce1dcf4..61a5a326395d 100644
--- a/pkgs/development/ocaml-modules/yaml/default.nix
+++ b/pkgs/development/ocaml-modules/yaml/default.nix
@@ -19,7 +19,8 @@ buildDunePackage rec {
propagatedBuildInputs = [ bos ctypes ];
doCheck = true;
- nativeCheckInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ];
+ nativeCheckInputs = [ mdx.bin ];
+ checkInputs = [ fmt logs alcotest crowbar junit_alcotest ezjsonm ];
meta = {
description = "Parse and generate YAML 1.1 files";
diff --git a/pkgs/development/ocaml-modules/yuscii/default.nix b/pkgs/development/ocaml-modules/yuscii/default.nix
index 44f64361540e..c0582fa2a224 100644
--- a/pkgs/development/ocaml-modules/yuscii/default.nix
+++ b/pkgs/development/ocaml-modules/yuscii/default.nix
@@ -19,10 +19,10 @@ buildDunePackage rec {
sha256 = "0idywlkw0fbakrxv65swnr5bj7f2vns9kpay7q03gzlv82p670hy";
};
- useDune2 = true;
-
nativeCheckInputs = [
gcc
+ ];
+ checkInputs = [
alcotest
fmt
uutf
diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix
index e156e8cbb331..5a78809d9099 100644
--- a/pkgs/development/ocaml-modules/yuujinchou/default.nix
+++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix
@@ -14,7 +14,7 @@ buildDunePackage rec {
};
doCheck = true;
- nativeCheckInputs = [ qcheck-alcotest ];
+ checkInputs = [ qcheck-alcotest ];
meta = {
description = "Name pattern combinators";
diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix
index bdf833276067..53c09cfa019f 100644
--- a/pkgs/development/python-modules/adlfs/default.nix
+++ b/pkgs/development/python-modules/adlfs/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "adlfs";
- version = "2022.11.2";
+ version = "2023.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "fsspec";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-S6dJK5ZhDCSwM/14sTrXNJ/+dDe9OeDRemsnuoe4IW0=";
+ hash = "sha256-eSfdRiIr8xJEoLMs2114NX0CsBMlku9qjUXA23D5qgY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix
new file mode 100644
index 000000000000..fddabeccd6a1
--- /dev/null
+++ b/pkgs/development/python-modules/aio-pika/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, aiormq
+, yarl
+, aiomisc
+, shortuuid
+}:
+
+buildPythonPackage rec {
+ pname = "aio-pika";
+ version = "8.3.0";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "mosquito";
+ repo = pname;
+ rev = version;
+ sha256 = "CYfj6V/91J7JA8YSctG/FkSHRkwyLKxr27eREbA+MtQ=";
+ };
+
+ propagatedBuildInputs = [
+ aiormq
+ yarl
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+ checkInputs = [
+ aiomisc
+ shortuuid
+ ];
+ # Tests attempt to connect to a RabbitMQ server
+ disabledTestPaths = [
+ "tests/test_amqp.py"
+ "tests/test_amqp_robust.py"
+ "tests/test_amqp_robust_proxy.py"
+ "tests/test_amqps.py"
+ "tests/test_master.py"
+ "tests/test_memory_leak.py"
+ "tests/test_rpc.py"
+ "tests/test_types.py"
+ ];
+ pythonImportsCheck = [ "aio_pika" ];
+
+ meta = with lib; {
+ description = "AMQP 0.9 client designed for asyncio and humans";
+ homepage = "https://github.com/mosquito/aio-pika";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ emilytrau ];
+ };
+}
diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix
new file mode 100644
index 000000000000..747f38026686
--- /dev/null
+++ b/pkgs/development/python-modules/aiormq/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytestCheckHook
+, pamqp
+, yarl
+, setuptools
+, poetry-core
+, aiomisc
+}:
+
+buildPythonPackage rec {
+ pname = "aiormq";
+ version = "6.6.4";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchFromGitHub {
+ owner = "mosquito";
+ repo = pname;
+ rev = version;
+ sha256 = "+zTSaQzBoIHDUQgOpD6xvoruFFHZBb0z5D6uAUo0W5A=";
+ };
+
+ nativeBuildInputs = [
+ setuptools
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ pamqp
+ yarl
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+ checkInputs = [
+ aiomisc
+ ];
+ # Tests attempt to connect to a RabbitMQ server
+ disabledTestPaths = [
+ "tests/test_channel.py"
+ "tests/test_connection.py"
+ ];
+ pythonImportsCheck = [ "aiormq" ];
+
+ meta = with lib; {
+ description = "AMQP 0.9.1 asynchronous client library";
+ homepage = "https://github.com/mosquito/aiormq";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ emilytrau ];
+ };
+}
diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix
index 104d404a6023..d89ada4a67e3 100644
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -3,13 +3,11 @@
, fetchFromGitHub
, aiohttp
, prettytable
-, mock
-, pytestCheckHook
}:
buildPythonPackage rec {
pname = "aiosomecomfort";
- version = "0.0.3";
+ version = "0.0.6";
format = "setuptools";
@@ -17,26 +15,19 @@ buildPythonPackage rec {
owner = "mkmer";
repo = "AIOSomecomfort";
rev = "refs/tags/${version}";
- hash = "sha256-Qw0KR934GS7AuT3nRYaunypt091fZLRioVbNOp9JesY=";
+ hash = "sha256-3p38gWCqQVYz3sgu6SgfPH+wH/ZH2Qg+tVXiARuUh7s=";
};
- postPatch = ''
- # https://github.com/mkmer/AIOSomecomfort/issues/1
- mv aiosomecomfort AIOSomecomfort
- '';
-
propagatedBuildInputs = [
aiohttp
prettytable
];
- checkInputs = [
- mock
- pytestCheckHook
+ pythonImportsCheck = [
+ "aiosomecomfort"
];
- # SyntaxError in test.py
- doCheck = false;
+ doCheck = false; # tests only run on windows, due to WindowsSelectorEventLoopPolicy
meta = {
description = "AsyicIO client for US models of Honeywell Thermostats";
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 9245b895124c..c170bc3da3c5 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "gvm-tools";
- version = "22.9.0";
+ version = "23.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-I+fnVRxkv8MjPOBElRZv2aigAOA0gGm5xoK+bFohfZA=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-TwGeLEfP69ZK/fkhS0sB6aPh8aDjg6Tri2mUUzk4jbk=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix
new file mode 100644
index 000000000000..f1b55e0ae817
--- /dev/null
+++ b/pkgs/development/python-modules/leidenalg/default.nix
@@ -0,0 +1,54 @@
+{ lib
+, buildPythonPackage
+, ddt
+, fetchPypi
+, igraph
+, igraph-c
+, pythonOlder
+, setuptools-scm
+, unittestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "leidenalg";
+ version = "0.9.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-flz+O2+A8yuQ9V81xo1KmQsEibEoLPP6usjNpJiJdfM=";
+ };
+
+ postPatch = ''
+ substituteInPlace ./setup.py \
+ --replace "[\"/usr/include/igraph\", \"/usr/local/include/igraph\"]" \
+ "[\"${igraph-c.dev}/include/igraph\"]"
+
+ rm -r vendor
+ '';
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ igraph
+ igraph-c
+ ];
+
+ checkInputs = [
+ ddt
+ unittestCheckHook
+ ];
+
+ pythonImportsCheck = [ "leidenalg" ];
+
+ meta = with lib; {
+ description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python";
+ homepage = "https://leidenalg.readthedocs.io";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ jboy ];
+ };
+}
diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
index 2dac4243fe55..bacf0cbf52b2 100644
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
- version = "1.26.58";
+ version = "1.26.62";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-AqqVFIdxR9qZbqYunT0ybWsz9GycILJvHkX9ElugNRg=";
+ hash = "sha256-qBf/8o/ualbYlkEK4KbYSP/kNUgK43rBxIGUDZYOz+U=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 5d6b1511f16f..3c3c43c7ed98 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oci";
- version = "2.90.3";
+ version = "2.90.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
- hash = "sha256-mh4wLRNZzLU7sWvaVQWF6fexNrXIo8FMJ1u2RtMpE/E=";
+ hash = "sha256-alJ0FMh2bZLHG3pUfBJDpnihreSkswQ4BizIMIXKcFc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix
index e6d8bf28a652..f78ed6dd5adf 100644
--- a/pkgs/development/python-modules/ossfs/default.nix
+++ b/pkgs/development/python-modules/ossfs/default.nix
@@ -4,22 +4,36 @@
, fsspec
, oss2
, pythonOlder
+, setuptools-scm
+, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "ossfs";
- version = "2021.8.0";
- format = "setuptools";
+ version = "2023.1.0";
+ format = "pyproject";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "fsspec";
repo = pname;
- rev = version;
- hash = "sha256-bORiE3sIDNESjEizdzsJYZTSMbcqpbjostXo+0NQDfA=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo=";
};
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ pythonRelaxDeps = [
+ "fsspec"
+ "oss2"
+ ];
+
+ nativeBuildInputs = [
+ pythonRelaxDepsHook
+ setuptools-scm
+ ];
+
propagatedBuildInputs = [
fsspec
oss2
@@ -35,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Filesystem for Alibaba Cloud (Aliyun) Object Storage System (OSS)";
homepage = "https://github.com/fsspec/ossfs";
+ changelog = "https://github.com/fsspec/ossfs/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 406378adddd9..8657f4d28e79 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "pip-tools";
- version = "6.12.1";
+ version = "6.12.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-iO+3spqSP/6sBxPm8j74UpzGF1Un1CuT9zdWzJQ4cpM=";
+ hash = "sha256-i5A2lt9FmLENRpAm75mVxfmodLQW6I56IUiE6+SnAkU=";
};
patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index b53d9108ba11..ae3b4c551dd4 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pontos";
- version = "23.1.3";
+ version = "23.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-qmgfEsB3Mg6xjQxQLR2JMXATzurtuOem2kdIkD0WQXI=";
+ hash = "sha256-4GIfXHDY2g6dhvymYzunK2UWxJcO37dXQbI2jxOIwCw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix
index 704e8f7d2671..46cef2597522 100644
--- a/pkgs/development/python-modules/pony/default.nix
+++ b/pkgs/development/python-modules/pony/default.nix
@@ -3,6 +3,7 @@
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
+, pythonAtLeast
}:
buildPythonPackage rec {
@@ -10,7 +11,7 @@ buildPythonPackage rec {
version = "0.7.16";
format = "setuptools";
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.7" || pythonAtLeast "3.11";
src = fetchFromGitHub {
owner = "ponyorm";
diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index ed2c0022a0a3..8dab19a4f818 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "py-synologydsm-api";
- version = "2.1.0";
+ version = "2.1.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mib1185";
repo = "py-synologydsm-api";
rev = "refs/tags/v${version}";
- hash = "sha256-bolcqPIBHglZ7Em8/66MBypivDPehdgTaPOxAjR9Bd0=";
+ hash = "sha256-rT9KkSgIinJxTyJ40Z3VzMh23Ry9O3NFrLH4I2+NFPg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index d49488ffc3d1..8c6086092a71 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -3,6 +3,7 @@
, botocore
, buildPythonPackage
, fetchPypi
+, fsspec
, pandas
, pythonOlder
, tenacity
@@ -23,6 +24,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
boto3
botocore
+ fsspec
pandas
tenacity
];
diff --git a/pkgs/development/python-modules/pyqwikswitch/default.nix b/pkgs/development/python-modules/pyqwikswitch/default.nix
new file mode 100644
index 000000000000..20a5d59833db
--- /dev/null
+++ b/pkgs/development/python-modules/pyqwikswitch/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, attrs
+, requests
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "pyqwikswitch";
+ version = "0.94";
+ format = "setuptools";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc=";
+ };
+
+ propagatedBuildInputs = [
+ attrs
+ requests
+ ];
+
+ pythonImportsCheck = [
+ "pyqwikswitch"
+ "pyqwikswitch.threaded"
+ ];
+
+ doCheck = false; # no tests in sdist
+
+ meta = with lib; {
+ description = "QwikSwitch USB Modem API binding for Python";
+ homepage = "https://github.com/kellerza/pyqwikswitch";
+ license = licenses.mit;
+ maintainers = teams.home-assistant.members;
+ };
+}
diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix
index 37877610178f..fedf919c7ea8 100644
--- a/pkgs/development/python-modules/python-fsutil/default.nix
+++ b/pkgs/development/python-modules/python-fsutil/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "python-fsutil";
- version = "0.9.3";
+ version = "0.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "fabiocaccamo";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-fXfLXr8Zf3rQOkmfGx5SrbsFtw9AthohoV1NiRCOBM8=";
+ hash = "sha256-bHnCa7laDYi424czCGCPZuomqEOAeihjDTTW35ZTiac=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 6682b57ed7ae..55e11d49d1d1 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-gitlab";
- version = "3.12.0";
+ version = "3.13.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-VnOQwrk2kNrmLtlzi/nyIfpFwBN4/fiWCJ2/fIoTT70=";
+ hash = "sha256-rVArcrXRE39K831KaK4g/n1sl3j2fL4q7FZveZUFPH0=";
};
propagatedBuildInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Interact with GitLab API";
homepage = "https://github.com/python-gitlab/python-gitlab";
+ changelog = "https://github.com/python-gitlab/python-gitlab/blob/v${version}/CHANGELOG.md";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ nyanloutre ];
};
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 3ec6a5e18335..2215ac0c28e9 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
- version = "0.3.1";
+ version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
- hash = "sha256-XFqZ/5eK7cYPNsWNFu8UlJfMe28qSZNFrtozB80ZcNM=";
+ hash = "sha256-lLq+tmsyySpTO99ecH/uGK9b7/BJFbz5U2fSO/IrPGo=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index f21b2fa0c7bd..dd27a7ca110d 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -24,13 +24,13 @@
}:
buildPythonPackage rec {
- version = "3.5.6";
+ version = "3.5.7";
pname = "rpy2";
disabled = isPyPy;
src = fetchPypi {
inherit version pname;
- sha256 = "sha256-NATxAx0tj/ihACZWq445S4rBbdNMpDr2je7RAvOW53E=";
+ sha256 = "sha256-h6QJA3m0/DTn86Q0cXMJBndsNzmIhwhqgDV9ZP3QZUs=";
};
patches = [
diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix
index 821cba986980..9b140ae6fed5 100644
--- a/pkgs/development/python-modules/scim2-filter-parser/default.nix
+++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix
@@ -1,38 +1,58 @@
-{ stdenv, lib, fetchFromGitHub, buildPythonPackage, unittestCheckHook
-, pytest-runner, django
-, sly }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, django
+, sly
+, mock
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "scim2-filter-parser";
- version = "0.4.0";
- format = "setuptools";
+ version = "0.5.0";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "15five";
repo = pname;
- # gets rarely updated, we can then just replace the hash
rev = "refs/tags/${version}";
- hash = "sha256-ZemR5tn+T9WWgNB1FYrPJO6zh8g9zjobFZemi+MHkEE=";
+ hash = "sha256-QEPTYpWlRPWO6Evyt4zoqUST4ousF67GmiOpD7WUqcI=";
};
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace "poetry.masonry.api" "poetry.core.masonry.api"
+ '';
+
propagatedBuildInputs = [
sly
];
+ passthru.optional-dependencies = {
+ django-query = [
+ django
+ ];
+ };
+
pythonImportsCheck = [
"scim2_filter_parser"
];
nativeCheckInputs = [
- django
- pytest-runner
- unittestCheckHook
- ];
+ mock
+ pytestCheckHook
+ ] ++ passthru.optional-dependencies.django-query;
meta = with lib; {
description = "A customizable parser/transpiler for SCIM2.0 filters";
- homepage = "https://github.com/15five/scim2-filter-parser";
- license = licenses.mit;
+ homepage = "https://github.com/15five/scim2-filter-parser";
+ changelog = "https://github.com/15five/scim2-filter-parser/blob/${version}/CHANGELOG.rst";
+ license = licenses.mit;
maintainers = with maintainers; [ s1341 ];
};
}
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 6dae66a661ba..4fd3594b8826 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -31,14 +31,14 @@
buildPythonPackage rec {
pname = "spacy";
- version = "3.4.4";
+ version = "3.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-5QDPLLXxhJRhp5KPomlwN1YGm9+3FVkGUkCvbQIIsIw=";
+ hash = "sha256-/iAScBKZJ3iATZP3XOk3DViFcwcmOcODLOw49Uv35KU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 338112f8d7f7..80e82d353e98 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -1,17 +1,21 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, file
-, stdenv
+, pythonOlder
}:
buildPythonPackage rec {
pname = "sqlmap";
- version = "1.7";
+ version = "1.7.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-EQ7kdX14WkmH4b40W2sXplZdJw9SICYBpy6lPbMx8WY=";
+ hash = "sha256-XTLDdfNZXzqTreRan2kb0tGygdhdAW4JG3rZPKvkDfM=";
};
postPatch = ''
@@ -26,7 +30,9 @@ buildPythonPackage rec {
# No tests in archive
doCheck = false;
- pythonImportsCheck = [ "sqlmap" ];
+ pythonImportsCheck = [
+ "sqlmap"
+ ];
meta = with lib; {
description = "Automatic SQL injection and database takeover tool";
diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix
index 84dd9d77a8aa..1eed43519e7e 100644
--- a/pkgs/development/python-modules/swift/default.nix
+++ b/pkgs/development/python-modules/swift/default.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "swift";
- version = "2.30.0";
+ version = "2.31.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Ytxs7hWQa7iaBinO2nhiXhNvo7lsuhmDPnqE1K62C5k=";
+ sha256 = "sha256-gU6XQKiLv6E1OtSjwDunjhNIMK36//arcSsQRwuRtTY=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index f3c94bbb773a..e415bc17a7b3 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "thinc";
- version = "8.1.6";
+ version = "8.1.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-kkHDd2HwBP5oTmN9K02Lea3eurxk40OqHLoUT60sm0c=";
+ hash = "sha256-Dwj20fxQ4ovxiBTKKxyAfNTVmpMNcTRZpnXghsR3mvk=";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix
index a19858c46e7b..2166be051172 100644
--- a/pkgs/development/python-modules/tld/default.nix
+++ b/pkgs/development/python-modules/tld/default.nix
@@ -4,34 +4,45 @@
, faker
, fetchPypi
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "tld";
- version = "0.12.6";
+ version = "0.12.7";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0";
+ hash = "sha256-tvdynhnODrx3ugpltw1iE665UsAf9gXhKZquX7diHF4=";
};
nativeCheckInputs = [
- factory_boy
- faker
pytestCheckHook
];
- # these tests require network access, but disabledTestPaths doesn't work.
- # the file needs to be `import`ed by another python test file, so it
+ checkInputs = [
+ factory_boy
+ faker
+ ];
+
+ # These tests require network access, but disabledTestPaths doesn't work.
+ # the file needs to be `import`ed by another Python test file, so it
# can't simply be removed.
preCheck = ''
echo > src/tld/tests/test_commands.py
'';
- pythonImportsCheck = [ "tld" ];
+
+ pythonImportsCheck = [
+ "tld"
+ ];
meta = with lib; {
- homepage = "https://github.com/barseghyanartur/tld";
description = "Extracts the top level domain (TLD) from the URL given";
+ homepage = "https://github.com/barseghyanartur/tld";
+ changelog = "https://github.com/barseghyanartur/tld/blob/${version}/CHANGELOG.rst";
# https://github.com/barseghyanartur/tld/blob/master/README.rst#license
# MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
license = with licenses; [ lgpl21Plus mpl11 gpl2Only ];
diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix
index 932a88ef75a6..155b18f02841 100644
--- a/pkgs/development/python-modules/types-colorama/default.nix
+++ b/pkgs/development/python-modules/types-colorama/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-colorama";
- version = "0.4.15.4";
+ version = "0.4.15.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-YPfWJXkTE1IYVkzxudLpZ4wM5ywFHZ/6oadMdpBOWAg=";
+ hash = "sha256-PSqJbsfz0fZpz3ruoO9+usRznwLbM6sTKB5qcewvwsU=";
};
# Module has no tests
diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix
index da3b4b2fc9b7..103f71a70ade 100644
--- a/pkgs/development/python-modules/wasabi/default.nix
+++ b/pkgs/development/python-modules/wasabi/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "wasabi";
- version = "1.1.0";
+ version = "1.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU=";
+ sha256 = "sha256-9e58YJAngRvRbmIPL9enMZRmAFhI5BsFGmIFOrj9cNY=";
};
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix
index 7c8ce7492e19..a89645d0ba77 100644
--- a/pkgs/development/python-modules/whois/default.nix
+++ b/pkgs/development/python-modules/whois/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
- version = "0.9.25";
+ version = "0.9.26";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
- hash = "sha256-h4s0cJbzc5uorT9yPtXIgVDwUExUe3cNMSHCWRhN1Q4=";
+ hash = "sha256-AnKzn3GScy9jgnb7vmQ2x73n5C/5VxJr+lR03HqVwMU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index a7cc801c70cd..7a4ed91b9530 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
'';
- buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ])
+ strictDeps = true;
+
+ nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ];
+ buildInputs = with ocamlPackages; [ ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ]
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index 9dba3692ad3a..761662053c1d 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -44,13 +44,14 @@ stdenv.mkDerivation rec {
};
preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
-
postConfigure = "patchShebangs src/plugins/value/gen-api.sh";
- nativeBuildInputs = [ autoconf wrapGAppsHook ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ autoconf wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib ]);
buildInputs = with ocamlPackages; [
- ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip
+ ncurses ltl2ba ocamlgraph yojson menhirLib camlzip
lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen
ppx_deriving ppx_import
gdk-pixbuf
diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
index a3c28a0a9bc0..61efa78eaef4 100644
--- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
+++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "tflint-ruleset-aws";
- version = "0.17.1";
+ version = "0.21.2";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- hash = "sha256-2Qr+tG1cmDF9MdsLMOnIdSGWMVAYYVgobE/SuJZRqJg=";
+ hash = "sha256-uHl13TNn+ero9NiL2Fnly+4H7f9eti4UoEXHKJ+DHKo=";
};
- vendorHash = "sha256-P3yqDqVoC6XCX5OJ8kTvIk6Qq8X02Be51TajIkZxdbI=";
+ vendorHash = "sha256-mQzCqLJ3Y9l+BbfurtD/f/PRuXX+zYMeg8bPIjj05Nk=";
# upstream Makefile also does a go test $(go list ./... | grep -v integration)
preCheck = ''
diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix
index 130d7f1d23af..8ef941653e41 100644
--- a/pkgs/development/tools/b4/default.nix
+++ b/pkgs/development/tools/b4/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "b4";
- version = "0.10.1";
+ version = "0.12.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "zESWjmKz4DaiGg1VmbDlouTNm71YqIr1y9MCev72tEQ=";
+ sha256 = "sha256-BFvuxwcHG2KCv5LAeus50IDJ2mBCyixg3ETq9UzPmSA=";
};
# tests make dns requests and fails
diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix
index 60221444da0d..ac2d36c92391 100644
--- a/pkgs/development/tools/comby/default.nix
+++ b/pkgs/development/tools/comby/default.nix
@@ -28,12 +28,7 @@ let
patches = [ ./comby.patch ];
- nativeBuildInputs = [
- ocamlPackages.ppx_deriving
- ocamlPackages.ppx_deriving_yojson
- ocamlPackages.ppx_sexp_conv
- ocamlPackages.ppx_sexp_message
- ] ++ extraNativeInputs;
+ nativeBuildInputs = extraNativeInputs;
buildInputs = [
ocamlPackages.core
@@ -42,6 +37,10 @@ let
ocamlPackages.mparser
ocamlPackages.mparser-pcre
ocamlPackages.angstrom
+ ocamlPackages.ppx_deriving
+ ocamlPackages.ppx_deriving_yojson
+ ocamlPackages.ppx_sexp_conv
+ ocamlPackages.ppx_sexp_message
] ++ extraBuildInputs;
nativeCheckInputs = [ cacert ];
@@ -87,6 +86,9 @@ mkCombyPackage {
ocamlPackages.lwt_react
ocamlPackages.tar-unix
ocamlPackages.tls
+ ocamlPackages.ppx_jane
+ ocamlPackages.ppx_expect
+ ocamlPackages.dune-configurator
combyKernel
combySemantic
] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then
@@ -97,9 +99,6 @@ mkCombyPackage {
extraNativeInputs = [
autoconf
pkg-config
- ocamlPackages.ppx_jane
- ocamlPackages.ppx_expect
- ocamlPackages.dune-configurator
];
}
diff --git a/pkgs/development/tools/frink/default.nix b/pkgs/development/tools/frink/default.nix
new file mode 100644
index 000000000000..803fb63c5e6c
--- /dev/null
+++ b/pkgs/development/tools/frink/default.nix
@@ -0,0 +1,54 @@
+{ fetchurl
+, frink
+, jdk
+, lib
+, rlwrap
+, stdenv
+, testers
+}:
+stdenv.mkDerivation rec {
+ pname = "frink";
+ version = "2023-01-31";
+
+ src = fetchurl {
+ # Upstream does not provide versioned download links
+ url = "https://web.archive.org/web/20230202134810/https://frinklang.org/frinkjar/frink.jar";
+ sha256 = "sha256-xs1FQvFPgeAxscAiwBBP8N8aYe0OlsYbH/vbzzCbYZc=";
+ };
+
+ dontUnpack = true;
+
+ buildInputs = [ jdk rlwrap ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/lib
+
+ cp ${src} $out/lib/frink.jar
+
+ cat > "$out/bin/frink" << EOF
+ #!${stdenv.shell}
+ exec ${rlwrap}/bin/rlwrap ${jdk}/bin/java -classpath "$out/lib/frink.jar" frink.gui.FrinkStarter "\$@"
+ EOF
+
+ chmod a+x "$out/bin/frink"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A practical calculating tool and programming language";
+ homepage = "https://frinklang.org/";
+ license = licenses.unfree;
+ sourceProvenance = [ sourceTypes.binaryBytecode ];
+ maintainers = [ maintainers.stefanfehrenbach ];
+ };
+
+ passthru.tests = {
+ callFrinkVersion = testers.testVersion {
+ package = frink;
+ command = "frink -e 'FrinkVersion[]'";
+ };
+ };
+}
diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix
index b4c682bbd220..0686d4fb2ed4 100644
--- a/pkgs/development/tools/java/sawjap/default.nix
+++ b/pkgs/development/tools/java/sawjap/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation {
prePatch = "cd test";
- buildInputs = [ ocaml findlib sawja ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml findlib ];
+ buildInputs = [ sawja ];
buildPhase = ''
runHook preBuild
diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix
index 22f1e98f1826..ee26e81e8891 100644
--- a/pkgs/development/tools/language-servers/nil/default.nix
+++ b/pkgs/development/tools/language-servers/nil/default.nix
@@ -2,24 +2,28 @@
rustPlatform.buildRustPackage rec {
pname = "nil";
- version = "2023-01-01";
+ version = "2023-02-03";
src = fetchFromGitHub {
owner = "oxalica";
repo = pname;
rev = version;
- hash = "sha256-xpNlmGG7Qy0SPzXZ9sQ0i9Yo2hMaK+YsTEOTk10rs+k=";
+ hash = "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ=";
};
- cargoHash = "sha256-mwfM3hIEaHKa2oPVWzXpua+W2Oa5brvNRbRCcV0KapY=";
+ cargoHash = "sha256-k4hw+kH447uqsCASuaZxRx2xmMkmn9LM5sHYL2AJN9k=";
- CFG_DATE = version;
- CFG_REV = "release";
+ CFG_RELEASE = version;
nativeBuildInputs = [
(lib.getBin nix)
];
+ # might be related to https://github.com/NixOS/nix/issues/5884
+ preBuild = ''
+ export NIX_STATE_DIR=$(mktemp -d)
+ '';
+
passthru.updateScript = nix-update-script { };
meta = with lib; {
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index 471932ff83f7..dd25dd864cee 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -56,7 +56,9 @@ stdenv.mkDerivation rec {
inherit (param) sha256;
};
- buildInputs = [ which ocaml ocamlbuild ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ which ocaml ocamlbuild ];
# build fails otherwise
enableParallelBuilding = false;
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 65debca11c23..9d81c46e20c9 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
};
- buildInputs = [ ocaml perl ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml perl ];
prefixKey = "-prefix ";
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 753ef0a836b9..87db3baf0b0e 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -52,7 +52,9 @@ stdenv.mkDerivation {
sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
inherit meta;
diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix
index 7e48203c091e..7bc1f80c699f 100644
--- a/pkgs/development/tools/ocaml/dune-release/default.nix
+++ b/pkgs/development/tools/ocaml/dune-release/default.nix
@@ -20,10 +20,11 @@ in buildDunePackage rec {
sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs;
buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core
rresult logs odoc bos yojson astring fpath ];
- nativeCheckInputs = [ alcotest ] ++ runtimeInputs;
+ nativeCheckInputs = [ odoc ];
+ checkInputs = [ alcotest ] ++ runtimeInputs;
doCheck = true;
postPatch = ''
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index cec91a02f209..5faccab938ee 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,5 +1,5 @@
{ lib, fetchurl, buildDunePackage
-, cmdliner, yojson, ppxlib
+, cmdliner, yojson, ppxlib, findlib
, menhir, menhirLib
}:
@@ -17,7 +17,7 @@ buildDunePackage rec {
buildInputs = [ cmdliner ppxlib ];
configurePlatforms = [];
- propagatedBuildInputs = [ menhirLib yojson ];
+ propagatedBuildInputs = [ menhirLib yojson findlib ];
meta = {
description = "Compiler from OCaml bytecode to Javascript";
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix
index 8a4dce342231..4a0a87577cbf 100644
--- a/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/pkgs/development/tools/ocaml/obuild/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-dqWP9rwWmr7i3O29v/kipJL01B3qQozaToOFCdfTWZU=";
};
- buildInputs = [ ocaml ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml ];
buildPhase = ''
patchShebangs ./bootstrap
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index f5853057d8e0..095af7769140 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -11,7 +11,8 @@ with ocamlPackages; buildDunePackage rec {
sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ=";
};
- buildInputs = [ ncurses ocp-build lablgtk3-sourceview3 ocp-index ];
+ nativeBuildInputs = [ ocp-build ];
+ buildInputs = [ ncurses lablgtk3-sourceview3 ocp-index ];
configurePhase = ''
export TERM=xterm
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index b40c8b42546b..0ac69f86c90d 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = ''
substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"'
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 551a36adaed1..5b4f7e8e4407 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation {
sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa";
};
- buildInputs = [ ocaml findlib ocamlbuild ];
+ strictDeps = !doCheck;
+
+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
configurePhase = "ocaml setup.ml -configure --prefix $out"
+ lib.optionalString doCheck " --enable-tests";
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix
index 48b7d840a4f2..8277f4adb06d 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql";
};
- propagatedBuildInputs = [ ocaml findlib ];
+ nativeBuildInputs = [ ocaml findlib ];
patches = [ ./Makefile.patch ];
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index feb787d24d5d..de26536eb1c5 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ ocaml findlib cmdliner_1_0 re ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml findlib ];
+ buildInputs = [ cmdliner_1_0 re ];
propagatedBuildInputs = [ ncurses ];
preInstall = "mkdir -p $out/bin";
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index 54e1ee55a7bf..fcb43938112d 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
pname = "ocsigen-i18n";
version = "3.7.0";
- buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ];
+ strictDeps = true;
+
+ nativeBuildInputs = with ocamlPackages; [ ocaml findlib ];
+ buildInputs = with ocamlPackages; [ ppx_tools ];
dontStrip = true;
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index f6c7955c6863..b7d670ce4a7e 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q=";
};
- buildInputs = [ ocaml ncurses ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml ];
+ buildInputs = [ ncurses ];
meta = {
description = "A build system designed for scalability and portability";
diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
index 60804684ccbc..23a73002e6fe 100644
--- a/pkgs/development/tools/ocaml/opam/1.2.2.nix
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -47,8 +47,10 @@ in stdenv.mkDerivation {
pname = "opam";
version = "1.2.2";
- nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ curl ncurses ocaml ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper unzip curl ocaml ];
+ buildInputs = [ ncurses ];
src = srcs.opam;
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index de831fde99f1..1db7ea151fab 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -79,8 +79,10 @@ in stdenv.mkDerivation {
pname = "opam";
version = "2.1.4";
- nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ curl ncurses ocaml getconf ]
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper unzip ocaml curl ];
+ buildInputs = [ ncurses getconf ]
++ lib.optionals stdenv.isLinux [ bubblewrap ]
++ lib.optionals stdenv.isDarwin [ Foundation ];
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
index 8929afdef0ab..8b573039d7d8 100755
--- a/pkgs/development/tools/ocaml/opam/opam.nix.pl
+++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -68,8 +68,10 @@ in stdenv.mkDerivation {
pname = "opam";
version = "$OPAM_RELEASE";
- nativeBuildInputs = [ makeWrapper unzip ];
- buildInputs = [ curl ncurses ocaml getconf ]
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper unzip ocaml curl ];
+ buildInputs = [ ncurses getconf ]
++ lib.optionals stdenv.isLinux [ bubblewrap ]
++ lib.optionals stdenv.isDarwin [ Foundation ];
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 5d500339ff67..0afaff264947 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -11,7 +11,7 @@ let
version = "2.10.0";
sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA=";
duneVersion = "3";
- propagatedBuildInputs = [ lambda-term zed logs ];
+ propagatedBuildInputs = [ findlib lambda-term zed logs ];
}
else
{
diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix
new file mode 100644
index 000000000000..03117e9c1f41
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-ndk/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-ndk";
+ version = "2.12.6";
+
+ src = fetchFromGitHub {
+ owner = "bbqsrc";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-VGdFIMyZhb7SDWAXgs7kFlblYCO4rLf+3/N7Mashc4o=";
+ };
+
+ cargoHash = "sha256-pv6t9oKj5tdQjpvBgj/Y11uKJIaIWcaA9ib/Id/s+qs=";
+
+ meta = with lib; {
+ description = "Cargo extension for building Android NDK projects";
+ homepage = "https://github.com/bbqsrc/cargo-ndk";
+ license = with licenses; [ asl20 /* or */ mit ];
+ maintainers = with maintainers; [ mglolenstine ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 3d20600e1887..86accf5977b3 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -6,19 +6,13 @@ let
python = python3;
};
- npmPatches = callPackage ./npm-patches.nix { };
in
buildNodejs {
inherit enableNpm;
- version = "18.13.0";
- sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx";
+ version = "18.14.0";
+ sha256 = "sha256-Qu+d0xmT1cjoKwqwlpE1CT5qKW76J7G+mvwErADwJno=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
./bypass-darwin-xcrun-node16.patch
-
- (fetchpatch {
- url = "https://salsa.debian.org/js-team/nodejs/-/raw/master/debian/patches/riscv/fix-ftbfs-riscv64-18-13-0.patch";
- sha256 = "sha256-1hd0oJY9aIoKkL7WHHPlcbLunF89J7J197silc2sExE=";
- })
- ] ++ npmPatches;
+ ];
}
diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix
index b9cd476a1941..85739c36c132 100644
--- a/pkgs/development/web/nodejs/v19.nix
+++ b/pkgs/development/web/nodejs/v19.nix
@@ -9,8 +9,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "19.5.0";
- sha256 = "sha256-KBMXvce6iVITi/jw9fB2SV95+G6FGmWb4fmD3sM8pXc=";
+ version = "19.6.0";
+ sha256 = "sha256-UZxtVCqfmW8AwaPTsuXPUrfbmY2V9s7VqJPRagPeM+o=";
patches = [
./revert-arm64-pointer-auth.patch
./disable-darwin-v8-system-instrumentation-node19.patch
diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix
index 7f6ba52dccc4..4abd40e24ab0 100644
--- a/pkgs/games/prismlauncher/default.nix
+++ b/pkgs/games/prismlauncher/default.nix
@@ -34,13 +34,13 @@ in
stdenv.mkDerivation rec {
pname = "prismlauncher";
- version = "6.1";
+ version = "6.3";
src = fetchFromGitHub {
owner = "PrismLauncher";
repo = "PrismLauncher";
rev = version;
- sha256 = "sha256-aIBaenSnssv0/r2+UT5R4nBwo2QBGZ1Zp0CWOeiaeDE=";
+ sha256 = "sha256-7tptHKWkbdxTn6VIPxXE1K3opKRiUW2zv9r6J05dcS8=";
};
nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ];
diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix
new file mode 100644
index 000000000000..b6d0d59367e2
--- /dev/null
+++ b/pkgs/games/vvvvvv/default.nix
@@ -0,0 +1,93 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchurl
+, cmake
+, makeWrapper
+, copyDesktopItems
+, makeDesktopItem
+, physfs
+, SDL2
+, SDL2_mixer
+, tinyxml-2
+, utf8cpp
+, Foundation
+, IOKit
+, makeAndPlay ? false
+}:
+
+stdenv.mkDerivation rec {
+ pname = "vvvvvv";
+ version = "2.3.6";
+
+ src = fetchFromGitHub {
+ owner = "TerryCavanagh";
+ repo = "VVVVVV";
+ rev = version;
+ sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ=";
+ };
+ sourceRoot = "source/desktop_version";
+ dataZip = fetchurl {
+ url = "https://thelettervsixtim.es/makeandplay/data.zip";
+ name = "data.zip";
+ sha256 = "sha256-x2eAlZT2Ry2p9WE252ZX44ZA1YQWSkYRIlCsYpPswOo=";
+ meta.license = lib.licenses.unfree;
+ };
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ copyDesktopItems
+ ];
+
+ buildInputs = [
+ physfs
+ SDL2
+ SDL2_mixer
+ tinyxml-2
+ utf8cpp
+ ] ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ];
+
+ # Help CMake find SDL_mixer.h
+ NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2_mixer}/include/SDL2";
+
+ cmakeFlags = [ "-DBUNDLE_DEPENDENCIES=OFF" ] ++ lib.optional makeAndPlay "-DMAKEANDPLAY=ON";
+
+ desktopItems = [
+ (makeDesktopItem {
+ type = "Application";
+ name = "VVVVVV";
+ desktopName = "VVVVVV";
+ comment = meta.description;
+ exec = pname;
+ icon = "VVVVVV";
+ terminal = false;
+ categories = [ "Game" ];
+ })
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 VVVVVV $out/bin/${pname}
+ install -Dm644 "$src/desktop_version/icon.ico" "$out/share/pixmaps/VVVVVV.png"
+
+ wrapProgram $out/bin/${pname} --add-flags "-assets ${dataZip}"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A retro-styled platform game" + lib.optionalString makeAndPlay " (redistributable, without original levels)";
+ longDescription = ''
+ VVVVVV is a platform game all about exploring one simple mechanical
+ idea - what if you reversed gravity instead of jumping?
+ '' + lib.optionalString makeAndPlay ''
+ (Redistributable version, doesn't include the original levels.)
+ '';
+ homepage = "https://thelettervsixtim.es";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ martfont ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 244fced25ef6..cef442ad20ca 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "6.2-rc2";
+ version = "6.2-rc6";
extraMeta.branch = lib.versions.majorMinor version;
# modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- hash = "sha256-QRmOwtoGG2uNCNcAIAltrCT7zaD2V+RNe3bjHGn5+ts=";
+ hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc=";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix
index 43c9bf74e3fa..683448cbe41b 100644
--- a/pkgs/os-specific/linux/libpsm2/default.nix
+++ b/pkgs/os-specific/linux/libpsm2/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libpsm2";
- version = "11.2.229";
+ version = "11.2.230";
preConfigure= ''
export UDEVDIR=$out/etc/udev
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "opa-psm2";
rev = "PSM2_${version}";
- sha256 = "sha256-t3tZCxGmGMscDmeyCATLbHxU7jEJqAzxwPV0Z8pl2ko=";
+ sha256 = "sha256-dMfGq067TqstGAWNSZZaZCwvChTyPUsvaPVjFGGzp64=";
};
postInstall = ''
diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix
index 14c4822f3fb4..0fd0ecd63797 100644
--- a/pkgs/servers/calibre-web/default.nix
+++ b/pkgs/servers/calibre-web/default.nix
@@ -2,6 +2,7 @@
, fetchFromGitHub
, nixosTests
, python3
+, fetchpatch
}:
python3.pkgs.buildPythonApplication rec {
@@ -43,6 +44,12 @@ python3.pkgs.buildPythonApplication rec {
# and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters
# are stored in the DB.
./db-migrations.patch
+ # Handle version 3.0 of flask-babel
+ (fetchpatch {
+ url = "https://github.com/janeczku/calibre-web/commit/94a6931d48d347ae6c07e2b5f0301e8cf97cf53d.patch";
+ excludes = [ "requirements.txt" ];
+ hash = "sha256-0DQ+LbIOOwjBXQh+b1w8dYQ3s+xZ6nFoH5GvgJdBAFI=";
+ })
];
# calibre-web doesn't follow setuptools directory structure. The following is taken from the script
@@ -59,6 +66,7 @@ python3.pkgs.buildPythonApplication rec {
--replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \
--replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \
--replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \
+ --replace "Flask-Babel>=0.11.1,<2.1.0" "Flask-Babel>=0.11.1" \
--replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \
--replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \
--replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 7e255c01d35d..539dbd6a8065 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.2.4";
+ version = "3.2.5";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13";
+ sha256 = "c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index aee57689308f..ed64f6b791f4 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -90,7 +90,7 @@ unwrapped = stdenv.mkDerivation rec {
doInstallCheck = with stdenv; hostPlatform == buildPlatform;
nativeInstallCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
installCheckPhase = ''
- meson test --print-errorlogs
+ meson test --print-errorlogs --no-suite snowflake
'';
meta = with lib; {
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 1d1e2a94ae11..a2551e362a58 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2023.2.0";
+ version = "2023.2.1";
components = {
"3_day_blinds" = ps: with ps; [
];
@@ -2970,7 +2970,8 @@
pyqvrpro
];
"qwikswitch" = ps: with ps; [
- ]; # missing inputs: pyqwikswitch
+ pyqwikswitch
+ ];
"rachio" = ps: with ps; [
pyturbojpeg
aiohttp-cors
@@ -4899,6 +4900,7 @@
"qingping"
"qld_bushfire"
"qnap_qsw"
+ "qwikswitch"
"rachio"
"radarr"
"radio_browser"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 83607eb7f97a..62e8b042815a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -271,7 +271,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2023.2.0";
+ hassVersion = "2023.2.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -289,9 +289,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
- hash = "sha256-tW1tVPJ50DIGIuxJP9nq4+Tw4fiPA+kINSclW7JkJmE=";
+ hash = "sha256-gWcq0E/k6c4YQJwLlU379kse2u4Yn6xvLZ5QnGXVTJA=";
};
+ nativeBuildInputs = with python3.pkgs; [
+ setuptools
+ ];
+
# leave this in, so users don't have to constantly update their downstream patch handling
patches = [
(substituteAll {
@@ -328,7 +332,7 @@ in python.pkgs.buildPythonApplication rec {
'';
propagatedBuildInputs = with python.pkgs; [
- # Only packages required in setup.py
+ # Only packages required in pyproject.toml
aiohttp
astral
async-timeout
@@ -346,6 +350,7 @@ in python.pkgs.buildPythonApplication rec {
lru-dict
orjson
pip
+ pyopenssl
pyjwt
python-slugify
pyyaml
@@ -353,10 +358,8 @@ in python.pkgs.buildPythonApplication rec {
voluptuous
voluptuous-serialize
yarl
- # Not in setup.py, but used in homeassistant/util/package.py
+ # Implicit dependency via homeassistant/requirements.py
setuptools
- # Not in setup.py, but uncounditionally imported via tests/conftest.py
- paho-mqtt
] ++ componentBuildInputs ++ extraBuildInputs;
makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip";
@@ -369,22 +372,28 @@ in python.pkgs.buildPythonApplication rec {
freezegun
pytest-asyncio
pytest-aiohttp
- pytest-freezegun
+ pytest-freezer
pytest-mock
pytest-rerunfailures
pytest-socket
+ pytest-timeout
pytest-unordered
pytest-xdist
pytestCheckHook
requests-mock
respx
stdlib-list
- # required by tests/auth/mfa_modules
+ tomli
+ # required through tests/auth/mfa_modules/test_otp.py
pyotp
+ # Sneakily imported in tests/conftest.py
+ paho-mqtt
] ++ lib.concatMap (component: getPackages component python.pkgs) [
# some components are needed even if tests in tests/components are disabled
"default_config"
"hue"
+ # for tests/test_config.py::test_merge_id_schema
+ "qwikswitch"
];
pytestFlagsArray = [
@@ -395,8 +404,8 @@ in python.pkgs.buildPythonApplication rec {
"--only-rerun RuntimeError"
# enable full variable printing on error
"--showlocals"
- # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
- "--deselect tests/helpers/test_system_info.py::test_container_installationtype"
+ # AssertionError: assert 1 == 0
+ "--deselect tests/test_config.py::test_merge"
# tests are located in tests/
"tests"
];
@@ -408,17 +417,6 @@ in python.pkgs.buildPythonApplication rec {
"tests/pylint"
# don't bulk test all components
"tests/components"
- # pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
- "tests/auth/mfa_modules/test_notify.py"
- ];
-
- disabledTests = [
- # AssertionError: assert 1 == 0
- "test_merge"
- # Tests are flaky
- "test_config_platform_valid"
- # Test requires pylint>=2.13.0
- "test_invalid_discovery_info"
];
preCheck = ''
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 59661f357f8b..a3b1e7df1a5e 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20230201.0";
+ version = "20230202.0";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
- hash = "sha256-CG4I3YI1swiAV02+NXvi9n87dXrTJFlMUcOnB9ebmWk=";
+ hash = "sha256-Wo3bQnwTDSAC4EhJeYIXx1wODyx3wA2KMMaM3pJEkGw=";
};
# there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 75b63ec99a64..734823e9f475 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -76,8 +76,8 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
++ home-assistant.getPackages component home-assistant.python.pkgs
++ extraCheckInputs.${component} or [ ];
- disabledTests = old.disabledTests ++ extraDisabledTests.${component} or [];
- disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ];
+ disabledTests = old.disabledTests or [] ++ extraDisabledTests.${component} or [];
+ disabledTestPaths = old.disabledTestPaths or [] ++ extraDisabledTestPaths.${component} or [ ];
# components are more often racy than the core
dontUsePytestXdist = true;
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 88c7c5a3def9..2e19c299391e 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -16,20 +16,20 @@
buildGoModule rec {
pname = "evcc";
- version = "0.111.1";
+ version = "0.112.0";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
- hash = "sha256-2ZxEUhDNF2E5http8Pz21L0tw6r4UOK5XYDXbHJDnEU=";
+ hash = "sha256-v8qYQLYBZJSXENJXqwxp0JeA1wuWMLCs8kOK6FOoa9c=";
};
- vendorHash = "sha256-+qne/eB+z8e0vStC9V0w7jgWgo3vvkaR42dUe+/eXDE=";
+ vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g=";
npmDeps = fetchNpmDeps {
inherit src;
- hash = "sha256-zrNfev2x5quuujifRHUufBK/GnR7QkCypHCyYb4nwkI=";
+ hash = "sha256-bUdyRrrU+lWGouGHweNHRhHe3/jEb4nSviU1t4AriMU=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix
index d74e1a0fab64..2a5a0a2308b6 100644
--- a/pkgs/servers/limesurvey/default.nix
+++ b/pkgs/servers/limesurvey/default.nix
@@ -37,5 +37,9 @@ stdenv.mkDerivation rec {
homepage = "https://www.limesurvey.org";
maintainers = with maintainers; [offline];
platforms = with platforms; unix;
+ knownVulnerabilities = [
+ "CVE-2022-48008"
+ "CVE-2022-48010"
+ ];
};
}
diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix
index d058a0b2931a..169222e4d43d 100644
--- a/pkgs/servers/tracing/tempo/default.nix
+++ b/pkgs/servers/tracing/tempo/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "tempo";
- version = "1.5.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "grafana";
repo = "tempo";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "sha256-m7tfDd0Yjg4+VHZPxYJXEx2XNNodepMcPLucBjvd88s=";
+ sha256 = "sha256-sVvQQm2hE5J6ZesL8YRkdq/OwzHziBCsa3D/b1kYPpw=";
};
vendorSha256 = null;
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index 0d0b63711d2c..b88307101017 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -6,6 +6,7 @@
, sphinx
, nixosTests
, pkgs
+, fetchPypi
}:
let
@@ -74,6 +75,17 @@ let
# keep the scope, as it is used throughout the derivation and tests
# this also makes potential future overrides easier
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
+ # flask-security-too 4.1.5 is incompatible with flask-babel 3.x
+ flask-babel = prev.flask-babel.overridePythonAttrs (oldAttrs: rec {
+ version = "2.0.0";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
+ };
+ nativeBuildInputs = [ ];
+ format = "setuptools";
+ outputs = [ "out" ];
+ });
# flask 2.2 is incompatible with pgadmin 6.18
# https://redmine.postgresql.org/issues/7651
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index c162521870ba..e68b565d0581 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -5,17 +5,17 @@
buildGoModule rec {
pname = "trivy";
- version = "0.36.1";
+ version = "0.37.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-V6x7xILG2/mg95S3qv8pM6ZVXWmh1iHMvDVEfidHau4=";
+ sha256 = "sha256-4kjsNaiXnmJk88ivVnpTemOOc/asKrcZLGpO8gtV0J8=";
};
# hash missmatch on across linux and darwin
proxyVendor = true;
- vendorSha256 = "sha256-qTtx8+D288RT3wOdmvUXVeHx4GwIyCyCnO/sQW0blIU=";
+ vendorSha256 = "sha256-qI29Qb8im9Xii83ayG1jZtZsrsAT0JQOcuKOM7VYro0=";
excludedPackages = "misc";
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 411aaece5329..5f61a9660f2a 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -23,71 +23,76 @@ stdenv.mkDerivation {
--prefix PATH : ${lib.makeBinPath runtimePackages}
'';
- nativeBuildInputs = [ makeWrapper pkg-config ];
- buildInputs = [
- libjpeg
- which
- ocamlPackages.ocaml ocamlPackages.findlib
- # Mandatory dependencies
- ocamlPackages.dtools
- ocamlPackages.duppy
- ocamlPackages.mm
- ocamlPackages.ocaml_pcre
- ocamlPackages.menhir ocamlPackages.menhirLib
- ocamlPackages.camomile
- ocamlPackages.ocurl
- ocamlPackages.uri
- ocamlPackages.sedlex
+ strictDeps = true;
- # Recommended dependencies
- ocamlPackages.ffmpeg
-
- # Optional dependencies
- ocamlPackages.camlimages
- ocamlPackages.gd4o
- ocamlPackages.alsa
- ocamlPackages.ao
- ocamlPackages.bjack
- ocamlPackages.cry
- ocamlPackages.dssi
- ocamlPackages.faad
- ocamlPackages.fdkaac
- ocamlPackages.flac
- ocamlPackages.frei0r
- ocamlPackages.gstreamer
- ocamlPackages.inotify
- ocamlPackages.ladspa
- ocamlPackages.lame
- ocamlPackages.lastfm
- ocamlPackages.lilv
- ocamlPackages.lo
- ocamlPackages.mad
- ocamlPackages.magic
- ocamlPackages.ogg
- ocamlPackages.opus
- ocamlPackages.portaudio
- ocamlPackages.pulseaudio
- ocamlPackages.shine
- ocamlPackages.samplerate
- ocamlPackages.soundtouch
- ocamlPackages.speex
- ocamlPackages.srt
- ocamlPackages.ssl
- ocamlPackages.taglib
- ocamlPackages.theora
- ocamlPackages.vorbis
- ocamlPackages.xmlplaylist
- ocamlPackages.posix-time2
- ocamlPackages.tsdl
- ocamlPackages.tsdl-image
- ocamlPackages.tsdl-ttf
-
- # Undocumented dependencies
- ocamlPackages.graphics
- ocamlPackages.cohttp-lwt-unix
+ nativeBuildInputs =
+ [ makeWrapper pkg-config which
+ ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir
];
+ buildInputs = [
+ libjpeg
+
+ # Mandatory dependencies
+ ocamlPackages.dtools
+ ocamlPackages.duppy
+ ocamlPackages.mm
+ ocamlPackages.ocaml_pcre
+ ocamlPackages.menhir ocamlPackages.menhirLib
+ ocamlPackages.camomile
+ ocamlPackages.ocurl
+ ocamlPackages.uri
+ ocamlPackages.sedlex
+
+ # Recommended dependencies
+ ocamlPackages.ffmpeg
+
+ # Optional dependencies
+ ocamlPackages.camlimages
+ ocamlPackages.gd4o
+ ocamlPackages.alsa
+ ocamlPackages.ao
+ ocamlPackages.bjack
+ ocamlPackages.cry
+ ocamlPackages.dssi
+ ocamlPackages.faad
+ ocamlPackages.fdkaac
+ ocamlPackages.flac
+ ocamlPackages.frei0r
+ ocamlPackages.gstreamer
+ ocamlPackages.inotify
+ ocamlPackages.ladspa
+ ocamlPackages.lame
+ ocamlPackages.lastfm
+ ocamlPackages.lilv
+ ocamlPackages.lo
+ ocamlPackages.mad
+ ocamlPackages.magic
+ ocamlPackages.ogg
+ ocamlPackages.opus
+ ocamlPackages.portaudio
+ ocamlPackages.pulseaudio
+ ocamlPackages.shine
+ ocamlPackages.samplerate
+ ocamlPackages.soundtouch
+ ocamlPackages.speex
+ ocamlPackages.srt
+ ocamlPackages.ssl
+ ocamlPackages.taglib
+ ocamlPackages.theora
+ ocamlPackages.vorbis
+ ocamlPackages.xmlplaylist
+ ocamlPackages.posix-time2
+ ocamlPackages.tsdl
+ ocamlPackages.tsdl-image
+ ocamlPackages.tsdl-ttf
+
+ # Undocumented dependencies
+ ocamlPackages.graphics
+ ocamlPackages.cohttp-lwt-unix
+ ];
+
meta = with lib; {
description = "Swiss-army knife for multimedia streaming";
homepage = "https://www.liquidsoap.info/";
diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/tools/graphics/gfxreconstruct/default.nix
index 2c486b475322..4004be69ffb0 100644
--- a/pkgs/tools/graphics/gfxreconstruct/default.nix
+++ b/pkgs/tools/graphics/gfxreconstruct/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "gfxreconstruct";
- version = "0.9.17";
+ version = "0.9.18";
src = fetchFromGitHub {
owner = "LunarG";
repo = "gfxreconstruct";
rev = "v${version}";
- hash = "sha256-CkZxxMoV2cqyh4ck81ODPxTYuSeQ8Q33a/4lL7UOfIY=";
+ hash = "sha256-9MDmeHid/faHeBjBfPgpRMjMMXZeHKP0VZZJtEQgBhs=";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix
index 5c7c488af852..d95efa0dbd08 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@@ -12,13 +12,13 @@
mkDerivation rec {
pname = "antimicrox";
- version = "3.3.2";
+ version = "3.3.3";
src = fetchFromGitHub {
owner = "AntiMicroX";
repo = pname;
rev = version;
- sha256 = "sha256-qp9K0lF7joFhfepncUoHvekMS+fZcPaBrsWY2DKmIUs=";
+ sha256 = "sha256-svEk+IFttkCXmoAOFH3k2rRC/OL9HXOLiuGrCh10YNc=";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 0add7340ed5a..2e5ebd1e56a2 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j";
};
- buildInputs = [ ocaml perl ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ ocaml perl ];
meta = with lib; {
description = "A collection of tools for translating from BibTeX to HTML";
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index c920aebd3216..257e75628ed2 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "broot";
- version = "1.19.0";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = "Canop";
repo = pname;
rev = "v${version}";
- hash = "sha256-pg+eHmClDd04tWljQUS0IRyMzkHnkpkofuhz/KyQbWo=";
+ hash = "sha256-+bOdUjBMxYT4qbZ8g5l0pDZJhXaeuYVygb13sx7mg28=";
};
- cargoHash = "sha256-+RUYC39L7yyh1xYPfZn7tDIf1cmmBuGcqTNibFk7s6M=";
+ cargoHash = "sha256-r/oj5ZgBjJXowFa95GKPACruH3bnPHjjyaSRewogXHQ=";
nativeBuildInputs = [
installShellFiles
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index cb53f4517377..eeca15dddd41 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.15.0";
+ version = "1.15.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JVvkASYNp6GSCEIWfZwZ1rtOkUCutccOWCkt47rmgyE=";
+ sha256 = "sha256-cLbAxF1g+N6XcpZS5+jDTykkbXoK7seKEmhCkp6noo8=";
};
- vendorSha256 = "sha256-jFItDgmjjKbmTpOn32V1K3AmYyYCrc5RqMAH/X+VWTM=";
+ vendorSha256 = "sha256-VpmSTNO3XgZpOu2OToq5HUJTagX9Hg7a65Cqgr8IlkU=";
ldflags = [
"-s"
diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/tools/misc/ledit/default.nix
index 18efb8c95285..6070bfb2fafb 100644
--- a/pkgs/tools/misc/ledit/default.nix
+++ b/pkgs/tools/misc/ledit/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation {
substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin
'';
- buildInputs = [
+ strictDeps = true;
+
+ nativeBuildInputs = [
ocaml
camlp5
];
diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 615e9e528d72..04fe534984ed 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook
, gtk2, hicolor-icon-theme, intltool, pkg-config
-, which, wrapGAppsHook, xdotool }:
+, which, wrapGAppsHook, xdotool, libappindicator-gtk2 }:
stdenv.mkDerivation rec {
pname = "parcellite";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
- buildInputs = [ gtk2 hicolor-icon-theme ];
+ buildInputs = [ gtk2 hicolor-icon-theme libappindicator-gtk2 ];
NIX_LDFLAGS = "-lgio-2.0";
preFixup = ''
diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index d1244cc73c47..df8b4933aa69 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"
'';
- buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ];
+ strictDeps = true;
+ nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp4 ];
+ buildInputs = [ ncurses remind ];
preferLocalBuild = true;
diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix
index 4f4576dfe297..439af060fa19 100644
--- a/pkgs/tools/networking/aardvark-dns/default.nix
+++ b/pkgs/tools/networking/aardvark-dns/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "aardvark-dns";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-tQTa/iIo7kpcQq1p2romoOG2qNOiSDH7DHx3iZYLY8w=";
+ hash = "sha256-N439ubEayoyfGrzkXE7+TeJQkddy8PZn5Lhmc/X5VxU=";
};
- cargoHash = "sha256-naWkSXQHfImd6R+RHKkmTe8UiqxknZEFYoJ0g/URCVY=";
+ cargoHash = "sha256-cIHz672jd8NKLyLvwsZInLerdA9MXRgWdpJFgMSgs9Q=";
passthru.tests = { inherit (nixosTests) podman; };
diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix
index 1618dac132ee..8bccb3afb26d 100644
--- a/pkgs/tools/networking/ligolo-ng/default.nix
+++ b/pkgs/tools/networking/ligolo-ng/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ligolo-ng";
- version = "0.3.3";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "tnpitsecurity";
repo = "ligolo-ng";
rev = "v${version}";
- sha256 = "sha256-KXyvoHtPC71QkB+X6cRCBxAUcTuy+j8/ZAJe7n6EdGc=";
+ sha256 = "sha256-BuKSIJGeHuHfzcaADgGqKyQ6oy5RAUHyRs8e+d/Nf+0=";
};
postConfigure = ''
@@ -17,7 +17,7 @@ buildGoModule rec {
ldflags = [ "-s" "-w" "-extldflags '-static'" ];
- vendorSha256 = "sha256-dzHdPgOjYXSozDxehkVNQocsYdH0u0p80c1THUzedk8=";
+ vendorHash = "sha256-If0K6DmkGk3AmO3eb/ocAl1RJeBN/xgY7dOh9lnVLh8=";
doCheck = false; # tests require network access
diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix
index bac09558e7fb..46037d2c4fdc 100644
--- a/pkgs/tools/networking/netavark/default.nix
+++ b/pkgs/tools/networking/netavark/default.nix
@@ -3,23 +3,24 @@
, fetchFromGitHub
, installShellFiles
, mandown
+, protobuf
, nixosTests
}:
rustPlatform.buildRustPackage rec {
pname = "netavark";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-nG+HTwF3v8FUK2SE+I312Ec5y6YPShS9si9Pc2SG1jc=";
+ hash = "sha256-EuhnI7N8Ry6qV4q3QxdHdTuJ7F4gIA3a9NZnb33KWZ8=";
};
- cargoHash = "sha256-szIG1udBCZj18sN3IiQtOuR8qw/xWhTMgb/n4lyTwvs=";
+ cargoHash = "sha256-2FEtYnIRg4s92K8Kr123tuZqUsGOauel2JdeSF0bFGo=";
- nativeBuildInputs = [ installShellFiles mandown ];
+ nativeBuildInputs = [ installShellFiles mandown protobuf ];
postBuild = ''
make -C docs netavark.1
diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix
index af4c18e1ce3a..8f3ed67abcfb 100644
--- a/pkgs/tools/networking/networkmanager/libnma/default.nix
+++ b/pkgs/tools/networking/networkmanager/libnma/default.nix
@@ -23,25 +23,24 @@
, glib
, substituteAll
, lib
+, _experimental-update-script-combinators
+, makeHardcodeGsettingsPatch
}:
stdenv.mkDerivation rec {
pname = "libnma";
- version = "1.10.4";
+ version = "1.10.6";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "eecw3aGfmzSIb0BkqhcPGiMmsIMp1lXYC2fpBsf3i3w=";
+ sha256 = "U6b7KxkK03xZhsrtPpi+3nw8YCOZ7k+TyPwFQwPXbas=";
};
patches = [
# Needed for wingpanel-indicator-network and switchboard-plug-network
./hardcode-gsettings.patch
- # Removing path from eap schema to fix bug when creating new VPN connection
- # https://gitlab.gnome.org/GNOME/libnma/-/issues/18
- ./remove-path-from-eap.patch
];
nativeBuildInputs = [
@@ -86,10 +85,24 @@ stdenv.mkDerivation rec {
'';
passthru = {
- updateScript = gnome.updateScript {
- packageName = pname;
- versionPolicy = "odd-unstable";
+ hardcodeGsettingsPatch = makeHardcodeGsettingsPatch {
+ schemaIdToVariableMapping = {
+ "org.gnome.nm-applet.eap" = "NM_APPLET_GSETTINGS";
+ };
+ inherit src;
};
+ updateScript =
+ let
+ updateSource = gnome.updateScript {
+ packageName = "libnma";
+ versionPolicy = "odd-unstable";
+ };
+ updateGsettingsPatch = _experimental-update-script-combinators.copyAttrOutputToFile "libnma.hardcodeGsettingsPatch" ./hardcode-gsettings.patch;
+ in
+ _experimental-update-script-combinators.sequence [
+ updateSource
+ updateGsettingsPatch
+ ];
};
meta = with lib; {
diff --git a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
index 9b2f5366950c..a68f96113d34 100644
--- a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
+++ b/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
@@ -1,26 +1,24 @@
+diff --git a/src/nma-ws/nma-eap.c b/src/nma-ws/nma-eap.c
+index fa36907..81df821 100644
--- a/src/nma-ws/nma-eap.c
+++ b/src/nma-ws/nma-eap.c
-@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection)
- static GSettings *
- _get_ca_ignore_settings (NMConnection *connection)
- {
-+ g_autoptr (GSettingsSchemaSource) *schema_source;
-+ g_autoptr (GSettingsSchema) *schema;
- GSettings *settings;
- char *path = NULL;
- const char *uuid;
-
- g_return_val_if_fail (connection, NULL);
-
-+ schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL);
-+ schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE);
-+
- uuid = nm_connection_get_uuid (connection);
+@@ -252,7 +252,18 @@ _get_ca_ignore_settings (NMConnection *connection)
g_return_val_if_fail (uuid && *uuid, NULL);
-
+
path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid);
- settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
-+ settings = g_settings_new_full (schema, NULL, path);
++ {
++ g_autoptr(GSettingsSchemaSource) schema_source;
++ g_autoptr(GSettingsSchema) schema;
++ schema_source = g_settings_schema_source_new_from_directory("@NM_APPLET_GSETTINGS@",
++ g_settings_schema_source_get_default(),
++ TRUE,
++ NULL);
++ schema = g_settings_schema_source_lookup(schema_source,
++ "org.gnome.nm-applet.eap",
++ FALSE);
++ settings = g_settings_new_full(schema, NULL, path);
++ }
g_free (path);
-
+
return settings;
diff --git a/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch b/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch
deleted file mode 100644
index fe00ff9d9a9b..000000000000
--- a/pkgs/tools/networking/networkmanager/libnma/remove-path-from-eap.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)"
-Date: Wed, 9 Nov 2022 08:00:19 +0000
-Subject: [PATCH] gschema: Remove path from eap schema
-
-This one needs to be relocatable, otherwise creating a new VPN
-connection will fail with:
-
- settings object created with schema 'org.gnome.nm-applet.eap'
- and path '/org/gnome/nm-applet/eap//',
- but path '/org/gnome/nm-applet/eap/' is specified by schema
-
-Fixes: https://bugs.archlinux.org/task/76490
----
- org.gnome.nm-applet.eap.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in
-index 0fc3ca9f..f4a56ea6 100644
---- a/org.gnome.nm-applet.eap.gschema.xml.in
-+++ b/org.gnome.nm-applet.eap.gschema.xml.in
-@@ -1,6 +1,6 @@
-
-
--
-+
-
- false
- Ignore CA certificate
---
-GitLab
-
diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index d4e2b590b08c..f478173123fa 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -18,8 +18,17 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security CoreServices ];
- cargoBuildFlags = [
- "--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun"
+ cargoBuildFeatures = [
+ "trust-dns"
+ "local-http-native-tls"
+ "local-tunnel"
+ "local-socks4"
+ "local-redir"
+ "local-dns"
+ "local-tun"
+ "aead-cipher-extra"
+ "aead-cipher-2022"
+ "aead-cipher-2022-extra"
];
# all of these rely on connecting to www.example.com:80
diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix
index b6fa0bab28d3..1320387a217e 100644
--- a/pkgs/tools/networking/xrootd/default.nix
+++ b/pkgs/tools/networking/xrootd/default.nix
@@ -16,7 +16,7 @@
, systemd
, voms
, zlib
-, enableTests ? true
+, enableTests ? stdenv.isLinux
# If not null, the builder will
# move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
, externalEtc ? "/etc"
@@ -37,11 +37,6 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" "man" ];
passthru.tests = lib.optionalAttrs enableTests {
- test-xrdcp = callPackage ./test-xrdcp.nix {
- url = "root://eospublic.cern.ch//eos/opendata/alice/2010/LHC10h/000138275/ESD/0000/AliESDs.root";
- hash = "sha256-tIcs2oi+8u/Qr+P7AAaPTbQT+DEt26gEdc4VNerlEHY=";
- };
- } // lib.optionalAttrs stdenv.isLinux {
test-runner = callPackage ./test-runner.nix { };
};
@@ -52,7 +47,6 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
- fuse
libkrb5
libuuid
libxcrypt
@@ -60,6 +54,7 @@ stdenv.mkDerivation rec {
openssl
readline
zlib
+ fuse
]
++ lib.optionals stdenv.isLinux [
systemd
diff --git a/pkgs/tools/networking/xrootd/test-xrdcp.nix b/pkgs/tools/networking/xrootd/test-xrdcp.nix
deleted file mode 100644
index 3b29e195813a..000000000000
--- a/pkgs/tools/networking/xrootd/test-xrdcp.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib
-, runCommandLocal
-, buildPlatform
-, xrootd
-, url
-, hash
-}: runCommandLocal (baseNameOf url)
-{
- nativeBuildInputs = [ xrootd ];
- outputHashAlgo = null;
- outputHashMode = "flat";
- outputHash = hash;
- inherit url;
-}
-# Set [DY]LD_LIBRARY_PATH to workaround #169677
-# TODO: Remove the library path after #200830 get merged
-''
- ${lib.optionalString buildPlatform.isDarwin "DY"}LD_LIBRARY_PATH=${lib.makeLibraryPath [ xrootd ]} xrdcp --force "$url" "$out"
-''
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index a0eb1f75a35d..f03ee980583f 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg=";
};
+ strictDeps = true;
+
nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix
index 755ac6bb32a3..26037b05664d 100644
--- a/pkgs/tools/typesetting/pdfsandwich/default.nix
+++ b/pkgs/tools/typesetting/pdfsandwich/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ ocaml perl ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ makeWrapper ocaml perl ];
installPhase = ''
mkdir -p $out/bin
cp -p pdfsandwich $out/bin
diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/tools/wayland/shotman/default.nix
index 91742a7c1c28..1b3461912492 100644
--- a/pkgs/tools/wayland/shotman/default.nix
+++ b/pkgs/tools/wayland/shotman/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "shotman";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromSourcehut {
owner = "~whynothugo";
repo = pname;
rev = "v${version}";
- hash = "sha256-QNRQInFZcB1nqzESTAqYWwqJ0oiJa6UMCpjY3aHBiyA=";
+ hash = "sha256-tyIvAe6wQxxHRkD46dYjHYtvv7OWDuurYi6tsdL8BtE=";
};
- cargoHash = "sha256-BfH1HhBbgdCA1IqKNdl4/FEzZxHgJmoSKNVMJUrSHCA=";
+ cargoHash = "sha256-N42dGImQPqa/NXpqhEnMDsG1mrdNh1BM0BDvRS6Oiio=";
nativeBuildInputs = [ pkg-config makeWrapper ];
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
index 3931fe9c3da0..7943457d3815 100644
--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@@ -25,12 +25,12 @@ ocamlPackages.buildDunePackage rec {
strictDeps = true;
nativeBuildInputs = [
- ocamlPackages.ppx_cstruct
pkg-config
];
buildInputs = [ libdrm ] ++ (with ocamlPackages; [
dune-configurator
+ ppx_cstruct
wayland
cmdliner
logs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d50705e8b47..1b254561397b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -508,6 +508,8 @@ with pkgs;
frece = callPackage ../development/tools/frece { };
+ frink = callPackage ../development/tools/frink { };
+
frugal = callPackage ../development/tools/frugal { };
glade = callPackage ../development/tools/glade { };
@@ -1601,12 +1603,7 @@ with pkgs;
xpaste = callPackage ../tools/text/xpaste { };
- xrootd = callPackage ../tools/networking/xrootd {
- fuse =
- if hostPlatform.isDarwin then osxfuse
- else if hostPlatform.isLinux then fuse
- else null;
- };
+ xrootd = callPackage ../tools/networking/xrootd { };
xtrt = callPackage ../tools/archivers/xtrt { };
@@ -4495,7 +4492,7 @@ with pkgs;
element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
- electron = electron_20;
+ electron = electron_22;
};
element-desktop-wayland = writeScriptBin "element-desktop" ''
#!/bin/sh
@@ -5097,8 +5094,9 @@ with pkgs;
mapcidr = callPackage ../tools/misc/mapcidr { };
- maple-mono = (callPackage ../data/fonts/maple-font { }).Mono-v5;
- maple-mono-NF = (callPackage ../data/fonts/maple-font { }).Mono-NF-v5;
+ maple-mono = (callPackage ../data/fonts/maple-font { }).Mono;
+ maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF;
+ maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF;
marl = callPackage ../development/libraries/marl {};
@@ -6813,7 +6811,7 @@ with pkgs;
schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
- electron = electron_20;
+ electron = electron_22;
};
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
#!/bin/sh
@@ -6997,6 +6995,8 @@ with pkgs;
emborg = python3Packages.callPackage ../development/python-modules/emborg { };
+ emblem = callPackage ../applications/graphics/emblem { };
+
emem = callPackage ../applications/misc/emem { };
empty = callPackage ../tools/misc/empty { };
@@ -14842,37 +14842,7 @@ with pkgs;
fsharp = callPackage ../development/compilers/fsharp { };
- fstar = callPackage ../development/compilers/fstar {
- # Work around while compatibility with ppxlib >= 0.26 is unavailable
- # Should be removed when a fix is available
- # See https://github.com/FStarLang/FStar/issues/2681
- ocamlPackages =
- ocamlPackages.overrideScope' (self: super: {
- ppxlib = super.ppxlib.override {
- version = if lib.versionAtLeast self.ocaml.version "4.07"
- then if lib.versionAtLeast self.ocaml.version "4.08"
- then "0.24.0" else "0.15.0" else "0.13.0";
- };
- ppx_deriving_yojson = super.ppx_deriving_yojson.overrideAttrs (oldAttrs: rec {
- version = "3.6.1";
- src = fetchFromGitHub {
- owner = "ocaml-ppx";
- repo = "ppx_deriving_yojson";
- rev = "v${version}";
- sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk";
- };
- });
- sedlex = super.sedlex.overrideAttrs (oldAttrs: rec {
- version = "2.5";
- src = fetchFromGitHub {
- owner = "ocaml-community";
- repo = "sedlex";
- rev = "v${version}";
- sha256 = "sha256:062a5dvrzvb81l3a9phljrhxfw9nlb61q341q0a6xn65hll3z2wy";
- };
- });
- });
- };
+ fstar = callPackage ../development/compilers/fstar { };
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
@@ -15799,6 +15769,9 @@ with pkgs;
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
inherit (darwin.apple_sdk.frameworks) Security;
};
+
+ cargo-ndk = callPackage ../development/tools/rust/cargo-ndk { };
+
cargo-nextest = callPackage ../development/tools/rust/cargo-nextest {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -31833,7 +31806,9 @@ with pkgs;
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix {};
- obsidian = callPackage ../applications/misc/obsidian { };
+ obsidian = callPackage ../applications/misc/obsidian {
+ electron = electron_21;
+ };
octoprint = callPackage ../applications/misc/octoprint { };
@@ -32206,6 +32181,8 @@ with pkgs;
ponymix = callPackage ../applications/audio/ponymix { };
+ pop-launcher = callPackage ../applications/misc/pop-launcher { };
+
popcorntime = callPackage ../applications/video/popcorntime {};
pothos = libsForQt5.callPackage ../applications/radio/pothos { };
@@ -35736,6 +35713,10 @@ with pkgs;
libpng = libpng12;
};
+ vvvvvv = callPackage ../games/vvvvvv {
+ inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
+ };
+
wargus = callPackage ../games/wargus { };
warmux = callPackage ../games/warmux { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09dbaf7ea32e..821cf78242f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -120,6 +120,8 @@ self: super: with self; {
aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
+ aio-pika = callPackage ../development/python-modules/aio-pika { };
+
aioairzone = callPackage ../development/python-modules/aioairzone { };
aioairq = callPackage ../development/python-modules/aioairq { };
@@ -300,6 +302,8 @@ self: super: with self; {
aioridwell = callPackage ../development/python-modules/aioridwell { };
+ aiormq = callPackage ../development/python-modules/aiormq { };
+
aiorpcx = callPackage ../development/python-modules/aiorpcx { };
aiortm = callPackage ../development/python-modules/aiortm { };
@@ -5255,6 +5259,10 @@ self: super: with self; {
inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
};
+ leidenalg = callPackage ../development/python-modules/leidenalg {
+ igraph-c = pkgs.igraph;
+ };
+
lektor = callPackage ../development/python-modules/lektor { };
leveldb = callPackage ../development/python-modules/leveldb { };
@@ -8616,6 +8624,8 @@ self: super: with self; {
pyqvrpro = callPackage ../development/python-modules/pyqvrpro { };
+ pyqwikswitch = callPackage ../development/python-modules/pyqwikswitch { };
+
pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { };
pyrad = callPackage ../development/python-modules/pyrad { };