diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e22c357b1c6f..3b4313c734cf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6852,6 +6852,12 @@
githubId = 3967312;
name = "Jocelyn Thode";
};
+ joedevivo = {
+ email = "55951+joedevivo@users.noreply.github.com";
+ github = "joedevivo";
+ githubId = 55951;
+ name = "Joe DeVivo";
+ };
joelancaster = {
email = "joe.a.lancas@gmail.com";
github = "JoeLancaster";
@@ -9419,6 +9425,12 @@
githubId = 1776903;
name = "Andrew Abbott";
};
+ mislavzanic = {
+ email = "mislavzanic3@gmail.com";
+ github = "mislavzanic";
+ githubId = 48838244;
+ name = "Mislav Zanic";
+ };
misterio77 = {
email = "eu@misterio.me";
github = "Misterio77";
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 242841a56b65..12023ce0797c 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
@@ -132,6 +132,14 @@
before upgrading their systems.
+
+
+ git-bug has been updated to at least
+ version 0.8.0, which includes backwards incompatible changes.
+ The git-bug-migration package can be used
+ to upgrade existing repositories.
+
+
The EC2 image module no longer fetches instance metadata in
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
index b5c74836ef40..c2ba8658d69c 100644
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -44,6 +44,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.
+- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
+
- The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service`
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index aacc584c5b84..b57f4a4986ce 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -97,6 +97,7 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-base
gstreamer
] ++ lib.optionals (withGstPlugins) [
+ gst-libav
gst-plugins-bad
gst-plugins-good
gst-plugins-ugly
diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix
index d8e57fdb508f..50eacf97bf85 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@@ -44,6 +44,7 @@ in buildFHSUserEnv rec {
xorg.libXext
xorg.libXrender
libudev0-shim
+ libxcrypt
];
passthru = { inherit unwrapped; };
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 6481c992e229..68afc4812068 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -821,6 +821,18 @@ final: prev:
meta.homepage = "https://github.com/ayu-theme/ayu-vim/";
};
+ b64-nvim = buildVimPluginFrom2Nix {
+ pname = "b64.nvim";
+ version = "2022-08-22";
+ src = fetchFromGitHub {
+ owner = "taybart";
+ repo = "b64.nvim";
+ rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3";
+ sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw";
+ };
+ meta.homepage = "https://github.com/taybart/b64.nvim/";
+ };
+
barbar-nvim = buildVimPluginFrom2Nix {
pname = "barbar.nvim";
version = "2023-01-03";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 36ef070fb765..30a191de7b1a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -67,6 +67,7 @@ https://github.com/rmagatti/auto-session/,,
https://github.com/vim-scripts/autoload_cscope.vim/,,
https://github.com/rafi/awesome-vim-colorschemes/,,
https://github.com/ayu-theme/ayu-vim/,,
+https://github.com/taybart/b64.nvim/,HEAD,
https://github.com/romgrk/barbar.nvim/,,
https://github.com/utilyre/barbecue.nvim/,,
https://github.com/chriskempson/base16-vim/,,
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index d9b6db8d653d..55e57ac01e4c 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "graphicsmagick";
- version = "1.3.38";
+ version = "1.3.39";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
- sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
+ sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8=";
};
patches = [
diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix
index b0d59d4a7f55..3178c50c933d 100644
--- a/pkgs/applications/graphics/openboard/default.nix
+++ b/pkgs/applications/graphics/openboard/default.nix
@@ -23,7 +23,7 @@ let
install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter
'';
};
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
pname = "openboard";
version = "unstable-2022-11-28";
@@ -36,9 +36,9 @@ in stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace OpenBoard.pro \
- --replace '/usr/include/quazip5' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
+ --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
--replace '-lquazip5' '-lquazip1-qt5' \
- --replace '/usr/include/poppler' '${poppler.dev}/include/poppler'
+ --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler'
'';
nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ];
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 7004d0dce34f..b1d3a5c0d6fc 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -51,6 +51,9 @@ stdenv.mkDerivation rec {
homepage = "https://repo.or.cz/w/llpp.git";
description = "A MuPDF based PDF pager written in OCaml";
platforms = platforms.linux;
+ # Project is unmaintained and fails to build:
+ # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int')
+ broken = true;
maintainers = with maintainers; [ pSub ];
license = licenses.gpl3;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index d64eea22c831..f54fcb589104 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,19 +45,19 @@
}
},
"ungoogled-chromium": {
- "version": "108.0.5359.125",
- "sha256": "0n8aigw7qv6dzd8898xz435kj79z73v916amfaxyz69g57pnpqhn",
+ "version": "109.0.5414.87",
+ "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8",
"sha256bin64": null,
"deps": {
"gn": {
- "version": "2022-10-05",
+ "version": "2022-11-10",
"url": "https://gn.googlesource.com/gn",
- "rev": "b9c6c19be95a3863e02f00f1fe403b2502e345b6",
- "sha256": "1rhadb6qk867jafr85x2m3asis3jv7x06blhmad2d296p26d5w6x"
+ "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41",
+ "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"
},
"ungoogled-patches": {
- "rev": "108.0.5359.125-1",
- "sha256": "1dacvzi6j4xyjjnrsb79mhhj7jc992z1di9acl4appfydlqadgv3"
+ "rev": "109.0.5414.87-1",
+ "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j"
}
}
}
diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/applications/networking/cluster/terraspace/Gemfile
new file mode 100644
index 000000000000..0bf6893eeec1
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraspace/Gemfile
@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "terraspace", '~> 2.2.3'
diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
new file mode 100644
index 000000000000..1c7b39767c6e
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
@@ -0,0 +1,129 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ activesupport (7.0.4)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ aws-eventstream (1.2.0)
+ aws-partitions (1.689.0)
+ aws-sdk-core (3.168.4)
+ aws-eventstream (~> 1, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.651.0)
+ aws-sigv4 (~> 1.5)
+ jmespath (~> 1, >= 1.6.1)
+ aws-sdk-kms (1.61.0)
+ aws-sdk-core (~> 3, >= 3.165.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.117.2)
+ aws-sdk-core (~> 3, >= 3.165.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.4)
+ aws-sigv4 (1.5.2)
+ aws-eventstream (~> 1, >= 1.0.2)
+ cli-format (0.2.2)
+ activesupport
+ text-table
+ zeitwerk
+ concurrent-ruby (1.1.10)
+ deep_merge (1.2.2)
+ diff-lcs (1.5.0)
+ dotenv (2.8.1)
+ dsl_evaluator (0.3.1)
+ activesupport
+ memoist
+ rainbow
+ zeitwerk
+ eventmachine (1.2.7)
+ eventmachine-tail (0.6.5)
+ eventmachine
+ graph (2.11.0)
+ hcl_parser (0.2.2)
+ rhcl
+ i18n (1.12.0)
+ concurrent-ruby (~> 1.0)
+ jmespath (1.6.2)
+ memoist (0.16.2)
+ minitest (5.17.0)
+ mini_portile2 (2.8.0)
+ nokogiri (1.13.9)
+ racc (~> 1.4)
+ mini_portile2 (~> 2.8.0)
+ racc (1.6.2)
+ rainbow (3.1.1)
+ render_me_pretty (0.8.4)
+ activesupport
+ rainbow
+ tilt
+ rexml (3.2.5)
+ rhcl (0.1.0)
+ deep_merge
+ rspec (3.12.0)
+ rspec-core (~> 3.12.0)
+ rspec-expectations (~> 3.12.0)
+ rspec-mocks (~> 3.12.0)
+ rspec-core (3.12.0)
+ rspec-support (~> 3.12.0)
+ rspec-expectations (3.12.2)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.12.0)
+ rspec-mocks (3.12.2)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.12.0)
+ rspec-support (3.12.0)
+ rspec-terraspace (0.3.2)
+ activesupport
+ memoist
+ rainbow
+ rspec
+ zeitwerk
+ rubyzip (2.3.2)
+ terraspace (2.2.3)
+ activesupport
+ bundler
+ cli-format
+ deep_merge
+ dotenv
+ dsl_evaluator
+ eventmachine-tail
+ graph
+ hcl_parser
+ memoist
+ rainbow
+ render_me_pretty
+ rexml
+ rspec-terraspace (>= 0.3.1)
+ terraspace-bundler (>= 0.5.0)
+ thor
+ tty-tree
+ zeitwerk
+ zip_folder
+ terraspace-bundler (0.5.0)
+ activesupport
+ aws-sdk-s3
+ dsl_evaluator
+ memoist
+ nokogiri
+ rainbow
+ rubyzip
+ thor
+ zeitwerk
+ text-table (1.2.4)
+ thor (1.2.1)
+ tilt (2.0.11)
+ tty-tree (0.4.0)
+ tzinfo (2.0.5)
+ concurrent-ruby (~> 1.0)
+ zeitwerk (2.6.6)
+ zip_folder (0.1.0)
+ rubyzip
+
+PLATFORMS
+ x86_64-linux
+
+DEPENDENCIES
+ terraspace (~> 2.2.3)
+
+BUNDLED WITH
+ 2.3.25
diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/applications/networking/cluster/terraspace/default.nix
new file mode 100644
index 000000000000..af7c1025356a
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraspace/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }:
+let
+ rubyEnv = bundlerEnv {
+ inherit ruby;
+ name = "terraspace";
+ gemdir = ./.;
+ };
+in stdenv.mkDerivation {
+ pname = "terraspace";
+ version = (import ./gemset.nix).terraspace.version;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ dontUnpack = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ makeWrapper ${rubyEnv}/bin/terraspace $out/bin/terraspace
+ wrapProgram $out/bin/terraspace \
+ --prefix PATH : ${lib.makeBinPath [ rubyEnv.ruby ]}
+ '';
+
+ passthru.updateScript = bundlerUpdateScript "terraspace";
+
+ meta = with lib; {
+ description = "Terraform framework that provides an organized structure, and keeps your code DRY";
+ homepage = "https://github.com/boltops-tools/terraspace";
+ license = licenses.asl20;
+ platforms = ruby.meta.platforms;
+ maintainers = with maintainers; [ mislavzanic ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/applications/networking/cluster/terraspace/gemset.nix
new file mode 100644
index 000000000000..cc5e64e944cf
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraspace/gemset.nix
@@ -0,0 +1,464 @@
+{
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0";
+ type = "gem";
+ };
+ version = "7.0.4";
+ };
+ aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ aws-partitions = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06878pd1kxbj54dh6jp11a1460dkyxvk4mzwp480gcdqy5jaqwhw";
+ type = "gem";
+ };
+ version = "1.689.0";
+ };
+ aws-sdk-core = {
+ dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "131acgw2hi893n0dfbczs42bkc41afhyrmd9w8zx5y8r1k5zd6rc";
+ type = "gem";
+ };
+ version = "3.168.4";
+ };
+ aws-sdk-kms = {
+ dependencies = ["aws-sdk-core" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ajp7yvnf95d60xmg618xznfwsy8h1vrkzj33r1bsf2gsfp50vzy";
+ type = "gem";
+ };
+ version = "1.61.0";
+ };
+ aws-sdk-s3 = {
+ dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1xpb8c8zw1c0grbw1rcc0ynlys1301vm9kkqy4ls3i2zqk5v6n91";
+ type = "gem";
+ };
+ version = "1.117.2";
+ };
+ aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
+ type = "gem";
+ };
+ version = "1.5.2";
+ };
+ cli-format = {
+ dependencies = ["activesupport" "text-table" "zeitwerk"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf";
+ type = "gem";
+ };
+ version = "0.2.2";
+ };
+ concurrent-ruby = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
+ type = "gem";
+ };
+ version = "1.1.10";
+ };
+ deep_merge = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3";
+ type = "gem";
+ };
+ version = "1.2.2";
+ };
+ diff-lcs = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
+ dotenv = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565";
+ type = "gem";
+ };
+ version = "2.8.1";
+ };
+ dsl_evaluator = {
+ dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
+ eventmachine = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+ type = "gem";
+ };
+ version = "1.2.7";
+ };
+ eventmachine-tail = {
+ dependencies = ["eventmachine"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0x5ly7mnfr6gibjyxz6lrxb4jbf05p0r8257qcgkf8rkwg9ynw0c";
+ type = "gem";
+ };
+ version = "0.6.5";
+ };
+ graph = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9";
+ type = "gem";
+ };
+ version = "2.11.0";
+ };
+ hcl_parser = {
+ dependencies = ["rhcl"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09d55i9y187xkw0fi0b5aq8wyzvq8w73ryi939dvzdzgss25m7jj";
+ type = "gem";
+ };
+ version = "0.2.2";
+ };
+ i18n = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
+ type = "gem";
+ };
+ version = "1.12.0";
+ };
+ jmespath = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
+ type = "gem";
+ };
+ version = "1.6.2";
+ };
+ memoist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
+ type = "gem";
+ };
+ version = "0.16.2";
+ };
+ minitest = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";
+ type = "gem";
+ };
+ version = "5.17.0";
+ };
+ mini_portile2 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
+ type = "gem";
+ };
+ version = "2.8.0";
+ };
+ nokogiri = {
+ dependencies = ["mini_portile2" "racc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
+ type = "gem";
+ };
+ version = "1.13.9";
+ };
+ racc = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
+ type = "gem";
+ };
+ version = "1.6.2";
+ };
+ rainbow = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
+ type = "gem";
+ };
+ version = "3.1.1";
+ };
+ render_me_pretty = {
+ dependencies = ["activesupport" "rainbow" "tilt"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1cd64d59jx6jjzhi5xngfa031sfpgs7zyq8bhc9y4smlz121l1ij";
+ type = "gem";
+ };
+ version = "0.8.4";
+ };
+ rexml = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+ type = "gem";
+ };
+ version = "3.2.5";
+ };
+ rhcl = {
+ dependencies = ["deep_merge"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c7xp9y9438mnqrfrvjp1fwy2lk0b1ixz45qi2g2kbl91ilhn834";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ rspec = {
+ dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
+ type = "gem";
+ };
+ version = "3.12.0";
+ };
+ rspec-core = {
+ dependencies = ["rspec-support"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4";
+ type = "gem";
+ };
+ version = "3.12.0";
+ };
+ rspec-expectations = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
+ type = "gem";
+ };
+ version = "3.12.2";
+ };
+ rspec-mocks = {
+ dependencies = ["diff-lcs" "rspec-support"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0k64i7ax6sqvh702s0xrll2g8isxx1x4zam95ck7122flsyh7van";
+ type = "gem";
+ };
+ version = "3.12.2";
+ };
+ rspec-support = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
+ type = "gem";
+ };
+ version = "3.12.0";
+ };
+ rspec-terraspace = {
+ dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "16bi6x6aynnkp7yh341fmvpiasm1vg43mxf61ji57akdhx4mam5q";
+ type = "gem";
+ };
+ version = "0.3.2";
+ };
+ rubyzip = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+ type = "gem";
+ };
+ version = "2.3.2";
+ };
+ terraspace = {
+ dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0m38gj4bpcafrbrfdck2pswknm2p6mqfq8mp6k3pkjkmk9p3w9a9";
+ type = "gem";
+ };
+ version = "2.2.3";
+ };
+ terraspace-bundler = {
+ dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0kn6is7zqlw8l4njj4pjwbdi95w651nz3qvqgc3vw07rchs08nnx";
+ type = "gem";
+ };
+ version = "0.5.0";
+ };
+ text-table = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06yhlnb49fn0fhkmi6lrziyv2hd42gcm2zi3sggm2qab48qxn94j";
+ type = "gem";
+ };
+ version = "1.2.4";
+ };
+ thor = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
+ tilt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v";
+ type = "gem";
+ };
+ version = "2.0.11";
+ };
+ tty-tree = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0w3nh9yppb7zaswa7d9hnhf6k64z5d3jd8xvpyg2mjfrzcw9rbgs";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
+ tzinfo = {
+ dependencies = ["concurrent-ruby"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5";
+ type = "gem";
+ };
+ version = "2.0.5";
+ };
+ zeitwerk = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv";
+ type = "gem";
+ };
+ version = "2.6.6";
+ };
+ zip_folder = {
+ dependencies = ["rubyzip"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1884a1ixy7bzm9yp8cjikhdfcn8205p4fsjq894ilby8i1whl58k";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix
index 42b8a929a213..d74f7a0530c8 100644
--- a/pkgs/applications/networking/instant-messengers/qq/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qq/default.nix
@@ -20,15 +20,15 @@
}:
let
- version = "3.0.0-565";
+ version = "3.0.0-571";
srcs = {
x86_64-linux = fetchurl {
- url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_amd64.deb";
- sha256 = "sha256-IfBbheVwg4b5PuLX9bzqSuTcElxNaV3tmbGd3v/NkCY=";
+ url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb";
+ sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ=";
};
aarch64-linux = fetchurl {
- url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_arm64.deb";
- sha256 = "sha256-6IlAJdPknaQzOE48sdxb5QbB+ZF1xKstF3ARGHM30GY=";
+ url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb";
+ sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY=";
};
};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index f7bed486d9bd..9fdf76bec2ba 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -67,13 +67,13 @@ let
sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA==";
};
};
- "@azure/core-lro-2.4.0" = {
+ "@azure/core-lro-2.5.0" = {
name = "_at_azure_slash_core-lro";
packageName = "@azure/core-lro";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz";
- sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==";
+ url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz";
+ sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ==";
};
};
"@azure/core-paging-1.4.0" = {
@@ -175,13 +175,13 @@ let
sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==";
};
};
- "@azure/msal-browser-2.32.1" = {
+ "@azure/msal-browser-2.32.2" = {
name = "_at_azure_slash_msal-browser";
packageName = "@azure/msal-browser";
- version = "2.32.1";
+ version = "2.32.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz";
- sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g==";
+ url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz";
+ sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==";
};
};
"@azure/msal-common-7.6.0" = {
@@ -193,22 +193,22 @@ let
sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q==";
};
};
- "@azure/msal-common-9.0.1" = {
+ "@azure/msal-common-9.0.2" = {
name = "_at_azure_slash_msal-common";
packageName = "@azure/msal-common";
- version = "9.0.1";
+ version = "9.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz";
- sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==";
+ url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz";
+ sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w==";
};
};
- "@azure/msal-node-1.14.5" = {
+ "@azure/msal-node-1.14.6" = {
name = "_at_azure_slash_msal-node";
packageName = "@azure/msal-node";
- version = "1.14.5";
+ version = "1.14.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz";
- sha512 = "NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==";
+ url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz";
+ sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==";
};
};
"@azure/storage-blob-12.12.0" = {
@@ -265,13 +265,13 @@ let
sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==";
};
};
- "@codemirror/language-6.3.2" = {
+ "@codemirror/language-6.4.0" = {
name = "_at_codemirror_slash_language";
packageName = "@codemirror/language";
- version = "6.3.2";
+ version = "6.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.2.tgz";
- sha512 = "g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA==";
+ url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz";
+ sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q==";
};
};
"@codemirror/lint-6.1.0" = {
@@ -292,13 +292,13 @@ let
sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==";
};
};
- "@codemirror/view-6.7.2" = {
+ "@codemirror/view-6.7.3" = {
name = "_at_codemirror_slash_view";
packageName = "@codemirror/view";
- version = "6.7.2";
+ version = "6.7.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.2.tgz";
- sha512 = "HeK2GyycxceaQVyvYVYXmn1vUKYYBsHCcfGRSsFO+3fRRtwXx2STK0YiFBmiWx2vtU9gUAJgIUXUN8a0osI8Ng==";
+ url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz";
+ sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw==";
};
};
"@colors/colors-1.5.0" = {
@@ -499,22 +499,22 @@ let
sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==";
};
};
- "@lezer/javascript-1.4.0" = {
+ "@lezer/javascript-1.4.1" = {
name = "_at_lezer_slash_javascript";
packageName = "@lezer/javascript";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.0.tgz";
- sha512 = "MQ3oLJGEtpUgZ03LOLI60tDnjSkKO6h9hZSe31qJ1UQV+I9bpv3pwSnPUnX0+e+3E1PBVkox0GB2/MXkxg0M2w==";
+ url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz";
+ sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==";
};
};
- "@lezer/lr-1.2.5" = {
+ "@lezer/lr-1.3.0" = {
name = "_at_lezer_slash_lr";
packageName = "@lezer/lr";
- version = "1.2.5";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.5.tgz";
- sha512 = "f9319YG1A/3ysgUE3bqCHEd7g+3ZZ71MWlwEc42mpnLVYXgfJJgtu1XAyBB4Kz8FmqmnFe9caopDqKeMMMAU6g==";
+ url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.0.tgz";
+ sha512 = "rpvS+WPS/PlbJCiW+bzXPbIFIRXmzRiTEDzMvrvgpED05w5ZQO59AzH3BJen2AnHuJIlP3DcJRjsKLTrkknUNA==";
};
};
"@mapbox/node-pre-gyp-1.0.10" = {
@@ -607,13 +607,13 @@ let
sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA==";
};
};
- "@oclif/core-1.23.2" = {
+ "@oclif/core-1.24.0" = {
name = "_at_oclif_slash_core";
packageName = "@oclif/core";
- version = "1.23.2";
+ version = "1.24.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@oclif/core/-/core-1.23.2.tgz";
- sha512 = "NdaOaUDTRc6g1yTkOAKiEVOiQhc5CNcWNXa0QF4IS4yTjNqp4DOzgtF9Dwe585nPEKzSbTBiz1wyLOa4qIHSRQ==";
+ url = "https://registry.npmjs.org/@oclif/core/-/core-1.24.0.tgz";
+ sha512 = "J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA==";
};
};
"@oclif/errors-1.3.6" = {
@@ -661,13 +661,13 @@ let
sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA==";
};
};
- "@opentelemetry/api-1.3.0" = {
+ "@opentelemetry/api-1.4.0" = {
name = "_at_opentelemetry_slash_api";
packageName = "@opentelemetry/api";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz";
- sha512 = "YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==";
+ url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz";
+ sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g==";
};
};
"@rudderstack/rudder-sdk-node-1.0.6" = {
@@ -706,49 +706,49 @@ let
sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA==";
};
};
- "@sentry/core-7.29.0" = {
+ "@sentry/core-7.30.0" = {
name = "_at_sentry_slash_core";
packageName = "@sentry/core";
- version = "7.29.0";
+ version = "7.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/core/-/core-7.29.0.tgz";
- sha512 = "+e9aIp2ljtT4EJq3901z6TfEVEeqZd5cWzbKEuQzPn2UO6If9+Utd7kY2Y31eQYb4QnJgZfiIEz1HonuYY6zqQ==";
+ url = "https://registry.npmjs.org/@sentry/core/-/core-7.30.0.tgz";
+ sha512 = "NeLigkBlpcK63ymM63GoIHurml6V3BUe1Vi+trwm4/qqOTzT7PQhvdJCX+o3+atzRBH+zdb6kd4VWx44Oye3KA==";
};
};
- "@sentry/integrations-7.29.0" = {
+ "@sentry/integrations-7.30.0" = {
name = "_at_sentry_slash_integrations";
packageName = "@sentry/integrations";
- version = "7.29.0";
+ version = "7.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.29.0.tgz";
- sha512 = "BkZe3ALij320VtC5bNkeSz3OUhT9oxZsj2lf5rCuRFqcqw4tvVNADF/Y98mf0L4VCy582M9MlNXmwfewJjxGOA==";
+ url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.30.0.tgz";
+ sha512 = "KU8TnJm1Yldxnhdu/EZcIGXU9ptGQPk6ot4smcNx/mKsy575VrDdyVDx8uIYURWyfsg7eOayt6VdC7ISSODp8A==";
};
};
- "@sentry/node-7.29.0" = {
+ "@sentry/node-7.30.0" = {
name = "_at_sentry_slash_node";
packageName = "@sentry/node";
- version = "7.29.0";
+ version = "7.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/node/-/node-7.29.0.tgz";
- sha512 = "s/bN/JS5gPTmwzVms4FtI5YNYtC9aGY4uqdx/llVrIiVv7G6md/oJJzKtO1C4dt6YshjGjSs5KCpEn1NM4+1iA==";
+ url = "https://registry.npmjs.org/@sentry/node/-/node-7.30.0.tgz";
+ sha512 = "YYasu6C3I0HBP4N1oc/ed2nunxhGJgtAWaKwq3lo8uk3uF6cB1A8+2e0CpjzU5ejhbaFPUBxHyj4th39Bvku/w==";
};
};
- "@sentry/types-7.29.0" = {
+ "@sentry/types-7.30.0" = {
name = "_at_sentry_slash_types";
packageName = "@sentry/types";
- version = "7.29.0";
+ version = "7.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/types/-/types-7.29.0.tgz";
- sha512 = "DmoEpoqHPty3VxqubS/5gxarwebHRlcBd/yuno+PS3xy++/i9YPjOWLZhU2jYs1cW68M9R6CcCOiC9f2ckJjdw==";
+ url = "https://registry.npmjs.org/@sentry/types/-/types-7.30.0.tgz";
+ sha512 = "l4A86typvt/SfWh5JffpdxNGkg5EEA8m35BzpIcKmCAQZUDmnb4b478r8jdD2uuOjLmPNmZr1tifdRW4NCLuxQ==";
};
};
- "@sentry/utils-7.29.0" = {
+ "@sentry/utils-7.30.0" = {
name = "_at_sentry_slash_utils";
packageName = "@sentry/utils";
- version = "7.29.0";
+ version = "7.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.29.0.tgz";
- sha512 = "ICcBwTiBGK8NQA8H2BJo0JcMN6yCeKLqNKNMVampRgS6wSfSk1edvcTdhRkW3bSktIGrIPZrKskBHyMwDGF2XQ==";
+ url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.30.0.tgz";
+ sha512 = "tSlBhr5u/LdE2emxIDTDmjmyRr99GnZGIAh5GwRxUgeDQ3VEfNUFlyFodBCbZ6yeYTYd6PWNih5xoHn1+Rf3Sw==";
};
};
"@servie/events-1.0.0" = {
@@ -1498,13 +1498,13 @@ let
sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ==";
};
};
- "aws-sdk-2.1290.0" = {
+ "aws-sdk-2.1293.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1290.0";
+ version = "2.1293.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1290.0.tgz";
- sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1293.0.tgz";
+ sha512 = "Wq4zPwJsrYLerXkWzllrTky3DM/Gwg8rKmC/79cDckGzDT8vZ2w/JfI5lW94ckRHjbqQXalChMH3GmWp0sV29Q==";
};
};
"aws-sign2-0.7.0" = {
@@ -1813,13 +1813,13 @@ let
sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==";
};
};
- "bson-4.7.1" = {
+ "bson-4.7.2" = {
name = "bson";
packageName = "bson";
- version = "4.7.1";
+ version = "4.7.2";
src = fetchurl {
- url = "https://registry.npmjs.org/bson/-/bson-4.7.1.tgz";
- sha512 = "XkuFtlCzi0WSy8D6PMhvrQ/q8VlZHN/2bJ/shJglwuA6TPD2ZP/hHLB7iDxOEWVINHN/UVTxP4pqZqOKMXPIXg==";
+ url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz";
+ sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==";
};
};
"buffer-4.9.2" = {
@@ -2623,13 +2623,13 @@ let
sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==";
};
};
- "cron-parser-4.7.0" = {
+ "cron-parser-4.7.1" = {
name = "cron-parser";
packageName = "cron-parser";
- version = "4.7.0";
+ version = "4.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.0.tgz";
- sha512 = "BdAELR+MCT2ZWsIBhZKDuUqIUCBjHHulPJnm53OfdRLA4EWBjva3R+KM5NeidJuGsNXdEcZkjC7SCnkW5rAFSA==";
+ url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz";
+ sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==";
};
};
"cross-spawn-4.0.2" = {
@@ -3289,13 +3289,13 @@ let
sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
};
};
- "es-abstract-1.21.0" = {
+ "es-abstract-1.21.1" = {
name = "es-abstract";
packageName = "es-abstract";
- version = "1.21.0";
+ version = "1.21.1";
src = fetchurl {
- url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz";
- sha512 = "GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==";
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz";
+ sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==";
};
};
"es-aggregate-error-1.0.9" = {
@@ -5404,13 +5404,13 @@ let
sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==";
};
};
- "libphonenumber-js-1.10.16" = {
+ "libphonenumber-js-1.10.18" = {
name = "libphonenumber-js";
packageName = "libphonenumber-js";
- version = "1.10.16";
+ version = "1.10.18";
src = fetchurl {
- url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.16.tgz";
- sha512 = "ga6F+8WSmMprzIKvRoeL/iAvkZWSdEpYCDISnXIiQTXw7sezfk+J9IHwzjK3b+6QvyZK8Gjjzjl3Hp+B5lpUXg==";
+ url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz";
+ sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og==";
};
};
"libpq-1.8.12" = {
@@ -5818,15 +5818,6 @@ let
sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==";
};
};
- "lru-cache-4.1.5" = {
- name = "lru-cache";
- packageName = "lru-cache";
- version = "4.1.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
- sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
- };
- };
"lru-cache-5.1.1" = {
name = "lru-cache";
packageName = "lru-cache";
@@ -5845,6 +5836,15 @@ let
sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
};
};
+ "lru-cache-7.14.1" = {
+ name = "lru-cache";
+ packageName = "lru-cache";
+ version = "7.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz";
+ sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==";
+ };
+ };
"lru-memoizer-2.1.4" = {
name = "lru-memoizer";
packageName = "lru-memoizer";
@@ -6430,13 +6430,13 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
- "n8n-core-0.150.0" = {
+ "n8n-core-0.150.1" = {
name = "n8n-core";
packageName = "n8n-core";
- version = "0.150.0";
+ version = "0.150.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.0.tgz";
- sha512 = "nSPvZWo1crZoNIDhzqvJbYN1P+EMYKAy10FGxLHu7w2AMBD3IFdVWT1JlYNBMW9aO4NSs0i/Q0NBrA/krSbhoA==";
+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.1.tgz";
+ sha512 = "75S8iJuy2TaxcBO82Pi72tprlKzJa57k1QOoxU34rCKAGfUVzBrmx8qbI+V/2oVAFmcsByp5s8XCbGrOkj8Z2Q==";
};
};
"n8n-design-system-0.50.1" = {
@@ -6448,40 +6448,40 @@ let
sha512 = "v7eVGosiF2K6aboKS8cydyS+3Brj118iDlAmkgvyla8QT5QV3PBtNEluuCIH8ySdTOGs3TtWzGXSNTdpTZ+rqg==";
};
};
- "n8n-editor-ui-0.176.1" = {
+ "n8n-editor-ui-0.176.2" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.176.1";
+ version = "0.176.2";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.1.tgz";
- sha512 = "ySWUKs096wybHDvoFcxKuR3uX5JHwPMWJUwzNFRpN4+bhy7a2SKkA8QAfeWIBPybgng6GgTA6IqPWbZ7LZ+xYQ==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.2.tgz";
+ sha512 = "amkHuLTMiBwUwHQbC31NIdhmizIVgXvw2yztiSqvdbFHNmuJG05QcQAeFexK+JA3HBx+RWKAWUsvSMc9Nw53rw==";
};
};
- "n8n-nodes-base-0.208.1" = {
+ "n8n-nodes-base-0.208.2" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.208.1";
+ version = "0.208.2";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.1.tgz";
- sha512 = "uGx2g5xrh6WZ1u8TzyiGHQt4v52LhULLmN6WGOS57Jg658FYiMfWe7soR1iEMTWk/FD2DPQNvoJptGqN7TLlCQ==";
+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.2.tgz";
+ sha512 = "711ujlB9GnKG8Mv0h5Q/ffETZ6CLArO0XSQRAVCqTZEQ8XdhmpWHn/eCHU2bxMEO9y7yy1E3VLL4MDwQaY8d0g==";
};
};
- "n8n-workflow-0.132.0" = {
+ "n8n-workflow-0.132.1" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
- version = "0.132.0";
+ version = "0.132.1";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.0.tgz";
- sha512 = "DmWxbOV0Z/8VBNVzQz1O5sD0q82DSxFgJvVRnqL8HayALiiLQbNvgniU2BYJz2SSgKzcpkXX4ZIt94CESqD50w==";
+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.1.tgz";
+ sha512 = "ksrKfg9hVrVQ5H6jvm7+7YGghVO38VU6ZoaMQWalLfiZHR/W+9l8F3yxdfLX1o8Ewbk0za5dm5tT5E/fc7+Gwg==";
};
};
- "named-placeholders-1.1.2" = {
+ "named-placeholders-1.1.3" = {
name = "named-placeholders";
packageName = "named-placeholders";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchurl {
- url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz";
- sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==";
+ url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz";
+ sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==";
};
};
"nan-2.17.0" = {
@@ -6583,13 +6583,13 @@ let
sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==";
};
};
- "node-abi-3.30.0" = {
+ "node-abi-3.31.0" = {
name = "node-abi";
packageName = "node-abi";
- version = "3.30.0";
+ version = "3.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz";
- sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==";
+ url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz";
+ sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==";
};
};
"node-abort-controller-3.0.1" = {
@@ -6709,6 +6709,15 @@ let
sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==";
};
};
+ "nodemailer-6.9.0" = {
+ name = "nodemailer";
+ packageName = "nodemailer";
+ version = "6.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz";
+ sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA==";
+ };
+ };
"nopt-5.0.0" = {
name = "nopt";
packageName = "nopt";
@@ -7843,13 +7852,13 @@ let
sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==";
};
};
- "punycode-2.1.1" = {
+ "punycode-2.2.0" = {
name = "punycode";
packageName = "punycode";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
- sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+ url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz";
+ sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==";
};
};
"python-struct-1.1.3" = {
@@ -10414,10 +10423,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.210.1";
+ version = "0.210.2";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.210.1.tgz";
- sha512 = "mlcpNkl8Nwq1K05rz1BGzoPhaqxsbKOPs4ixr8iueeADfkomsD7ywsRQ6lgHd2GuOGRzXg/upazU/I7exMTj2w==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.210.2.tgz";
+ sha512 = "VLlKjcyQnioWgdfZXN4zoQYGy42x7U2LK8zehx+XsjG6wJhrlYyCKzQpECjYZZhzBCYLCvgEzi+mNbqdLDlX7w==";
};
dependencies = [
(sources."@acuminous/bitsyntax-0.1.2" // {
@@ -10455,7 +10464,7 @@ in
];
})
sources."@azure/core-http-compat-1.3.0"
- (sources."@azure/core-lro-2.4.0" // {
+ (sources."@azure/core-lro-2.5.0" // {
dependencies = [
sources."tslib-2.4.1"
];
@@ -10507,15 +10516,16 @@ in
];
})
sources."@azure/ms-rest-nodeauth-3.1.1"
- (sources."@azure/msal-browser-2.32.1" // {
+ (sources."@azure/msal-browser-2.32.2" // {
dependencies = [
- sources."@azure/msal-common-9.0.1"
+ sources."@azure/msal-common-9.0.2"
];
})
sources."@azure/msal-common-7.6.0"
- (sources."@azure/msal-node-1.14.5" // {
+ (sources."@azure/msal-node-1.14.6" // {
dependencies = [
- sources."@azure/msal-common-9.0.1"
+ sources."@azure/msal-common-9.0.2"
+ sources."jsonwebtoken-9.0.0"
];
})
(sources."@azure/storage-blob-12.12.0" // {
@@ -10529,10 +10539,10 @@ in
sources."@codemirror/autocomplete-6.4.0"
sources."@codemirror/commands-6.1.3"
sources."@codemirror/lang-javascript-6.1.2"
- sources."@codemirror/language-6.3.2"
+ sources."@codemirror/language-6.4.0"
sources."@codemirror/lint-6.1.0"
sources."@codemirror/state-6.2.0"
- sources."@codemirror/view-6.7.2"
+ sources."@codemirror/view-6.7.3"
sources."@colors/colors-1.5.0"
sources."@curlconverter/yargs-0.0.2"
sources."@curlconverter/yargs-parser-0.0.1"
@@ -10567,8 +10577,8 @@ in
sources."@kwsites/promise-deferred-1.1.1"
sources."@lezer/common-1.0.2"
sources."@lezer/highlight-1.1.3"
- sources."@lezer/javascript-1.4.0"
- sources."@lezer/lr-1.2.5"
+ sources."@lezer/javascript-1.4.1"
+ sources."@lezer/lr-1.3.0"
sources."@mapbox/node-pre-gyp-1.0.10"
(sources."@n8n_io/license-sdk-1.8.0" // {
dependencies = [
@@ -10591,7 +10601,7 @@ in
sources."tslib-2.4.1"
];
})
- (sources."@oclif/core-1.23.2" // {
+ (sources."@oclif/core-1.24.0" // {
dependencies = [
sources."supports-color-8.1.1"
sources."tslib-2.4.1"
@@ -10614,7 +10624,7 @@ in
];
})
sources."@oclif/screen-3.0.4"
- sources."@opentelemetry/api-1.3.0"
+ sources."@opentelemetry/api-1.4.0"
(sources."@rudderstack/rudder-sdk-node-1.0.6" // {
dependencies = [
sources."bull-3.29.3"
@@ -10633,11 +10643,11 @@ in
sources."domhandler-5.0.3"
];
})
- sources."@sentry/core-7.29.0"
- sources."@sentry/integrations-7.29.0"
- sources."@sentry/node-7.29.0"
- sources."@sentry/types-7.29.0"
- sources."@sentry/utils-7.29.0"
+ sources."@sentry/core-7.30.0"
+ sources."@sentry/integrations-7.30.0"
+ sources."@sentry/node-7.30.0"
+ sources."@sentry/types-7.30.0"
+ sources."@sentry/utils-7.30.0"
sources."@servie/events-1.0.0"
sources."@sqltools/formatter-1.2.5"
sources."@techteamer/ocsp-1.0.0"
@@ -10757,7 +10767,7 @@ in
})
sources."available-typed-arrays-1.0.5"
sources."avsc-5.7.7"
- (sources."aws-sdk-2.1290.0" // {
+ (sources."aws-sdk-2.1293.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -10818,7 +10828,7 @@ in
sources."brace-expansion-2.0.1"
sources."braces-3.0.2"
sources."browser-request-0.3.3"
- sources."bson-4.7.1"
+ sources."bson-4.7.2"
sources."buffer-5.7.1"
sources."buffer-equal-constant-time-1.0.1"
sources."buffer-from-1.1.2"
@@ -10827,7 +10837,7 @@ in
sources."bufferutil-4.0.7"
(sources."bull-4.10.2" // {
dependencies = [
- sources."cron-parser-4.7.0"
+ sources."cron-parser-4.7.1"
];
})
sources."busboy-1.6.0"
@@ -11016,7 +11026,7 @@ in
sources."entities-2.2.0"
sources."env-paths-2.2.1"
sources."err-code-2.0.3"
- sources."es-abstract-1.21.0"
+ sources."es-abstract-1.21.1"
sources."es-aggregate-error-1.0.9"
sources."es-array-method-boxes-properly-1.0.0"
sources."es-set-tostringtag-2.0.1"
@@ -11319,7 +11329,7 @@ in
sources."levn-0.3.0"
sources."libbase64-1.2.1"
sources."libmime-5.2.0"
- sources."libphonenumber-js-1.10.16"
+ sources."libphonenumber-js-1.10.18"
sources."libpq-1.8.12"
sources."libqp-2.0.1"
sources."lie-3.1.1"
@@ -11378,6 +11388,7 @@ in
(sources."mailparser-3.6.3" // {
dependencies = [
sources."linkify-it-4.0.1"
+ sources."nodemailer-6.8.0"
];
})
sources."mailsplit-5.4.0"
@@ -11510,32 +11521,32 @@ in
];
})
sources."mz-2.7.0"
- (sources."n8n-core-0.150.0" // {
+ (sources."n8n-core-0.150.1" // {
dependencies = [
sources."concat-stream-2.0.0"
sources."readable-stream-3.6.0"
];
})
sources."n8n-design-system-0.50.1"
- (sources."n8n-editor-ui-0.176.1" // {
+ (sources."n8n-editor-ui-0.176.2" // {
dependencies = [
sources."luxon-2.5.2"
];
})
- (sources."n8n-nodes-base-0.208.1" // {
+ (sources."n8n-nodes-base-0.208.2" // {
dependencies = [
sources."chokidar-3.5.2"
sources."luxon-2.3.2"
];
})
- (sources."n8n-workflow-0.132.0" // {
+ (sources."n8n-workflow-0.132.1" // {
dependencies = [
sources."luxon-2.3.2"
];
})
- (sources."named-placeholders-1.1.2" // {
+ (sources."named-placeholders-1.1.3" // {
dependencies = [
- sources."lru-cache-4.1.5"
+ sources."lru-cache-7.14.1"
];
})
sources."nan-2.17.0"
@@ -11553,7 +11564,7 @@ in
sources."tslib-2.4.1"
];
})
- sources."node-abi-3.30.0"
+ sources."node-abi-3.31.0"
sources."node-abort-controller-3.0.1"
sources."node-addon-api-4.3.0"
sources."node-ensure-0.0.0"
@@ -11582,7 +11593,7 @@ in
sources."node-rsa-1.1.1"
sources."node-ssh-12.0.5"
sources."nodeify-1.0.1"
- sources."nodemailer-6.8.0"
+ sources."nodemailer-6.9.0"
sources."nopt-5.0.0"
sources."normalize-path-3.0.0"
sources."normalize-wheel-1.0.1"
@@ -11752,7 +11763,7 @@ in
sources."pump-2.0.1"
];
})
- sources."punycode-2.1.1"
+ sources."punycode-2.2.0"
sources."python-struct-1.1.3"
sources."qs-6.11.0"
sources."query-string-7.1.3"
diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix
new file mode 100644
index 000000000000..0e6216cdda42
--- /dev/null
+++ b/pkgs/applications/radio/gridtracker/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, nwjs
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gridtracker";
+ version = "1.22.1226";
+
+ src = fetchFromGitLab {
+ owner = "gridtracker.org";
+ repo = "gridtracker";
+ rev = "v${version}";
+ sha256 = "sha256-/Noc2aqHBjphX6RDqxQBI/OOKZgEnOndn0daBt1edXM=";
+ };
+
+ postPatch = ''
+ substituteInPlace Makefile \
+ --replace '$(DESTDIR)/usr' '$(DESTDIR)/'
+ substituteInPlace gridtracker.sh \
+ --replace "exec nw" "exec ${nwjs}/bin/nw" \
+ --replace "/usr/share/gridtracker" "$out/share/gridtracker"
+ substituteInPlace gridtracker.desktop \
+ --replace "/usr/share/gridtracker/gridview.png" "$out/share/gridtracker/gridview.png"
+ '';
+
+ makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ];
+
+ meta = with lib; {
+ description = "An amateur radio companion to WSJT-X or JTDX";
+ longDescription = ''
+ GridTracker listens to traffic from WSJT-X/JTDX, displays it on a map,
+ and has a sophisticated alerting and filtering system for finding and
+ working interesting stations. It also will upload QSO records to multiple
+ logging frameworks including Logbook of the World.
+ '';
+ homepage = "https://gridtracker.org";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ melling ];
+ };
+}
diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/applications/radio/grig/default.nix
new file mode 100644
index 000000000000..33ae8b8ff88b
--- /dev/null
+++ b/pkgs/applications/radio/grig/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, wrapGAppsHook
+, gtk2
+, hamlib_4 }:
+
+stdenv.mkDerivation rec {
+ pname = "grig";
+ version = "0.9.0";
+
+ src = fetchFromGitHub {
+ owner = "fillods";
+ repo = "grig";
+ rev = "GRIG-${lib.replaceStrings ["."] ["_"] version}";
+ sha256 = "sha256-OgIgHW9NMW/xSSti3naIR8AQWUtNSv5bYdOcObStBlM=";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
+ buildInputs = [ hamlib_4 gtk2 ];
+
+ meta = with lib; {
+ description = "A simple Ham Radio control (CAT) program based on Hamlib";
+ longDescription = ''
+ Grig is a graphical user interface for the Ham Radio Control Libraries.
+ It is intended to be simple and generic, presenting the user with the
+ same interface regardless of which radio they use.
+ '';
+ homepage = "https://groundstation.sourceforge.net/grig/";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ melling ];
+ };
+}
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index ca2b2e5175b0..22b65f2da313 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
cp -a ${parts}/* parts/
'';
- NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
+ NIX_CFLAGS_COMPILE = "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip";
qmakeFlags = [
"phoenix.pro"
diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/applications/version-management/git-bug-migration/default.nix
new file mode 100644
index 000000000000..53c496ae009a
--- /dev/null
+++ b/pkgs/applications/version-management/git-bug-migration/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildGoModule, fetchFromGitHub, git }:
+buildGoModule rec {
+ pname = "git-bug-migration";
+ version = "0.3.4";
+
+ src = fetchFromGitHub {
+ owner = "MichaelMure";
+ repo = "git-bug-migration";
+ rev = "v${version}";
+ hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
+ };
+
+ vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0=";
+
+ checkInputs = [ git ];
+
+ ldflags = [
+ "-X main.GitExactTag=${version}"
+ "-X main.GitLastTag=${version}"
+ ];
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ git config --global user.name 'Nixpkgs Test User'
+ git config --global user.email 'nobody@localhost'
+ '';
+
+ meta = with lib; {
+ description = "Tool for upgrading repositories using git-bug to new versions";
+ homepage = "https://github.com/MichaelMure/git-bug-migration";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ DeeUnderscore ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/applications/version-management/git-bug/default.nix
index b85681a73cd9..45c0557c30ad 100644
--- a/pkgs/applications/version-management/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-bug/default.nix
@@ -1,42 +1,43 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "git-bug";
- version = "0.8.0"; # the `rev` below pins the version of the source to get
- rev = "v0.8.0";
+ version = "0.8.0";
src = fetchFromGitHub {
- inherit rev;
owner = "MichaelMure";
repo = "git-bug";
+ rev = "v${version}";
sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";
};
vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE=";
+ nativeBuildInputs = [ installShellFiles ];
+
doCheck = false;
+ excludedPackages = [ "doc" "misc" ];
+
ldflags = [
- "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}"
+ "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}"
"-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}"
"-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}"
];
postInstall = ''
- install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug"
- install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug"
- install -D -m 0644 -t "$out/share/man/man1" doc/man/*
+ installShellCompletion \
+ --bash misc/completion/bash/git-bug \
+ --zsh misc/completion/zsh/git-bug \
+ --fish misc/completion/fish/git-bug
- # not sure why the following executables are in $out/bin/
- rm -f $out/bin/cmd
- rm -f $out/bin/completion
- rm -f $out/bin/doc
+ installManPage doc/man/*
'';
meta = with lib; {
description = "Distributed bug tracker embedded in Git";
homepage = "https://github.com/MichaelMure/git-bug";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ royneary ];
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ royneary DeeUnderscore ];
};
}
diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index 0212ea9b89d1..951d241ec65c 100644
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -12,13 +12,13 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.13.2";
+ version = "3.14.0";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
- hash = "sha256-K9oJvvESHWCJFSgqycA7N4cG7WbTDwXZExnXUs4Qlp8=";
+ hash = "sha256-UgWPm4IxzydO1qqhjbodUIAmqIhTIITYARMvw+F9T7E=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 9fe9aa457987..fed0f6cb3441 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -22,13 +22,14 @@ let
unwrapped = Agda;
tests = { inherit (nixosTests) agda; };
};
+ inherit (Agda) meta;
} ''
mkdir -p $out/bin
makeWrapper ${Agda}/bin/agda $out/bin/agda \
--add-flags "--with-compiler=${ghc}/bin/ghc" \
--add-flags "--library-file=${library-file}" \
--add-flags "--local-interfaces"
- makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode
+ ln -s ${Agda}/bin/agda-mode $out/bin/agda-mode
''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526
withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };
diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix
index 4cbbf5305094..e4801fbda8e3 100644
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "cubical";
- version = "0.4prec3e097a";
+ version = "0.4";
src = fetchFromGitHub {
repo = pname;
owner = "agda";
- rev = "c3e097a98c84083550fa31101346bd42a0501add";
- sha256 = "101cni2a9xvia1mglb94z61jm8xk9r5kc1sn44cri0qsmk1zbqxs";
+ rev = "v${version}";
+ hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/development/libraries/calcium/default.nix
new file mode 100644
index 000000000000..f73ee91b4f77
--- /dev/null
+++ b/pkgs/development/libraries/calcium/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, mpir
+, gmp
+, mpfr
+, flint
+, arb
+, antic
+}:
+
+stdenv.mkDerivation rec {
+ pname = "calcium";
+ version = "0.4.1";
+
+ src = fetchFromGitHub {
+ owner = "fredrik-johansson";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-Ony2FGMnWyNqD7adGeiDtysHNZ4ClMvQ1ijVPSHJmyc=";
+ };
+
+ buildInputs = [ mpir gmp mpfr flint arb antic ];
+
+ configureFlags = [
+ "--with-gmp=${gmp}"
+ "--with-mpir=${mpir}"
+ "--with-mpfr=${mpfr}"
+ "--with-flint=${flint}"
+ "--with-arb=${arb}"
+ "--with-antic=${antic}"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ description = "A C library for exact computation with real and complex numbers";
+ homepage = "https://fredrikj.net/calcium/";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ smasher164 ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix
index 85a2b1835244..dff497fbdc30 100644
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "libva-utils";
- version = "2.16.0";
+ version = "2.17.0";
src = fetchFromGitHub {
owner = "intel";
repo = "libva-utils";
rev = version;
- sha256 = "sha256-6gjOheppHGTHUoT+pVJ6Tfgj9qDB+/MjaI3Win4ULRM=";
+ sha256 = "sha256-zv62Jznifw3GG5n8CIE7rJu0POx0aT8btO9N6CoBfAE=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index eb7e1e9acc9b..ca09af9ef233 100644
--- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "nvidia-vaapi-driver";
- version = "unstable-2022-12-01";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "elFarto";
repo = pname;
- rev = "6e8b0d067c52c3a7e0c3de745337e6e733c59207";
- sha256 = "sha256-HL/sjNPsLhzl8NZ/9l8in27vUrMkyUIcNr/+HhiaTT0=";
+ rev = "v${version}";
+ sha256 = "sha256-RMFkClaWoFNeSglV5otS/rzI6JNQMiAHDzH3DoEHA5I=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix
index f7cf765e150d..dc3b2c92f191 100644
--- a/pkgs/development/libraries/protobufc/default.nix
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, autoreconfHook
, pkg-config
, protobuf
@@ -19,6 +20,14 @@ stdenv.mkDerivation rec {
hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM=";
};
+ patches = [
+ # https://github.com/protobuf-c/protobuf-c/pull/534
+ (fetchpatch {
+ url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch";
+ hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804=";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ protobuf zlib ];
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index 93801ae51a3f..8fec445fb94f 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -32,7 +32,6 @@
, libsepol
, vulkan-headers
, vulkan-loader
-, valgrind
, libthai
, libdrm
, libdatrie
@@ -143,7 +142,6 @@ stdenv.mkDerivation rec {
libthai
libdrm
libdatrie
- valgrind
udev
# Text rendering
fontconfig
@@ -276,6 +274,9 @@ stdenv.mkDerivation rec {
-e "/^bindir=/ c bindir=$dev/bin"
patchShebangs $out $dev
+
+ # QTEST_ASSERT and other macros keeps runtime reference to qtbase.dev
+ substituteInPlace "$dev/include/QtTest/qtestassert.h" --replace "__FILE__" "__BASE_FILE__"
'';
dontStrip = debugSymbols;
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
index 76231f866efe..fcb699298fe9 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
@@ -36,8 +36,4 @@ qtModule {
"bin/qmlscene"
"bin/qmltestrunner"
];
-
- NIX_CFLAGS_COMPILE = [
- "-fmacro-prefix-map=${qtbase.dev}=qtbase.dev"
- ];
}
diff --git a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix
index bb868dc61829..9c53f11e1a3c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtvirtualkeyboard.nix
@@ -11,5 +11,4 @@ qtModule {
qtInputs = [ qtbase qtdeclarative qtsvg ];
propagatedBuildInputs = [ hunspell ];
nativeBuildInputs = [ pkg-config ];
- outputs = [ "out" ];
}
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 610f408e4419..31bcdc374d7a 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
+ outputs = [ "out" "dev" ];
+
meta = with lib; {
description = "Provides access to ZIP archives from Qt programs";
license = licenses.lgpl21Plus;
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 51eaf99eea81..f7bab3a9321f 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -581,8 +581,7 @@ final: prev: {
typescript-language-server = prev.typescript-language-server.override {
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
postInstall = ''
- wrapProgram "$out/bin/typescript-language-server" \
- --suffix PATH : ${lib.makeBinPath [ final.typescript ]}
+ ${pkgs.xorg.lndir}/bin/lndir ${final.typescript} $out
'';
};
diff --git a/pkgs/development/ocaml-modules/bjack/default.nix b/pkgs/development/ocaml-modules/bjack/default.nix
index fa03194bde4a..a102d27c2879 100644
--- a/pkgs/development/ocaml-modules/bjack/default.nix
+++ b/pkgs/development/ocaml-modules/bjack/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, Accelerate, CoreAudio, dune-configurator, libsamplerate, libjack2 }:
buildDunePackage rec {
pname = "bjack";
@@ -13,7 +13,7 @@ buildDunePackage rec {
sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c";
};
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ];
propagatedBuildInputs = [ libsamplerate libjack2 ];
meta = with lib; {
diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix
index dc980ce4ab2a..3e6ac4ae2d96 100644
--- a/pkgs/development/ocaml-modules/cohttp/async.nix
+++ b/pkgs/development/ocaml-modules/cohttp/async.nix
@@ -28,6 +28,8 @@ buildDunePackage {
src
;
+ duneVersion = "3";
+
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 597d4107fceb..fcbed191ad6f 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -9,6 +9,7 @@ buildDunePackage rec {
version = "5.0.0";
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index 2886cac1c7b1..3a5d5ff529d0 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -9,6 +9,8 @@ buildDunePackage {
pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src;
+ duneVersion = "3";
+
buildInputs = [ cmdliner ppx_sexp_conv ];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 74fcfcbd4988..42e1d3808639 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -7,6 +7,8 @@ buildDunePackage {
src
;
+ duneVersion = "3";
+
buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/cohttp/mirage.nix b/pkgs/development/ocaml-modules/cohttp/mirage.nix
index 048202ccdbce..3b1c82194973 100644
--- a/pkgs/development/ocaml-modules/cohttp/mirage.nix
+++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix
@@ -10,6 +10,8 @@ buildDunePackage {
inherit (cohttp) version src;
+ duneVersion = "3";
+
nativeBuildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix
index fb5a96932164..a110e6dc1677 100644
--- a/pkgs/development/ocaml-modules/conduit/async.nix
+++ b/pkgs/development/ocaml-modules/conduit/async.nix
@@ -9,6 +9,8 @@ buildDunePackage {
src
;
+ duneVersion = "3";
+
buildInputs = [ ppx_sexp_conv ppx_here ];
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index d097ec66ac47..99f3df493396 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -7,7 +7,8 @@ buildDunePackage rec {
pname = "conduit";
version = "6.1.0";
- minimalOCamlVersion = "4.03";
+ minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index 81a77f356aff..cb86ea5f4f06 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -6,6 +6,7 @@
buildDunePackage {
pname = "conduit-lwt-unix";
inherit (conduit-lwt) version src;
+ duneVersion = "3";
buildInputs = [ ppx_sexp_conv ];
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 641d57db10e3..2ec6f556916d 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -3,6 +3,7 @@
buildDunePackage {
pname = "conduit-lwt";
inherit (conduit) version src;
+ duneVersion = "3";
buildInputs = [ ppx_sexp_conv ];
diff --git a/pkgs/development/ocaml-modules/conduit/mirage.nix b/pkgs/development/ocaml-modules/conduit/mirage.nix
index 61fb9b569b7b..09c7df5edab6 100644
--- a/pkgs/development/ocaml-modules/conduit/mirage.nix
+++ b/pkgs/development/ocaml-modules/conduit/mirage.nix
@@ -9,6 +9,7 @@ buildDunePackage {
pname = "conduit-mirage";
inherit (conduit-lwt) version src;
+ duneVersion = "3";
nativeBuildInputs = [ ppx_sexp_conv ];
diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix
index 20197e207af3..35e275f52f1b 100644
--- a/pkgs/development/ocaml-modules/curly/default.nix
+++ b/pkgs/development/ocaml-modules/curly/default.nix
@@ -6,13 +6,13 @@ buildDunePackage rec {
pname = "curly";
version = "0.2.0";
- minimumOCamlVersion = "4.02";
+ minimalOCamlVersion = "4.02";
- useDune2 = true;
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz";
- sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k";
+ hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8=";
};
propagatedBuildInputs = [ result ];
diff --git a/pkgs/development/ocaml-modules/dns/certify.nix b/pkgs/development/ocaml-modules/dns/certify.nix
index ff98b5508617..3260e139fbbb 100644
--- a/pkgs/development/ocaml-modules/dns/certify.nix
+++ b/pkgs/development/ocaml-modules/dns/certify.nix
@@ -8,6 +8,7 @@ buildDunePackage {
pname = "dns-certify";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
dns
diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix
index fd54d9c8c86f..6e23eeecba97 100644
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@@ -10,6 +10,7 @@ buildDunePackage {
minimalOCamlVersion = "4.08";
inherit (dns) version src;
+ duneVersion = "3";
# no need to propagate as this is primarily
# an executable package
diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix
index 6ef93dc4ad1d..bfcde93bbf83 100644
--- a/pkgs/development/ocaml-modules/dns/client.nix
+++ b/pkgs/development/ocaml-modules/dns/client.nix
@@ -10,6 +10,7 @@
buildDunePackage {
pname = "dns-client";
inherit (dns) src version;
+ duneVersion = "3";
propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
lwt mirage-random mirage-time mirage-clock
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 174adce4320f..70e3b4435370 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -5,13 +5,14 @@
buildDunePackage rec {
pname = "dns";
- version = "6.3.0";
+ version = "6.4.1";
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
- sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E=";
+ hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno=";
};
propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];
diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix
index 06fe3f057eb5..3e6acc474b3e 100644
--- a/pkgs/development/ocaml-modules/dns/dnssec.nix
+++ b/pkgs/development/ocaml-modules/dns/dnssec.nix
@@ -7,6 +7,7 @@ buildDunePackage {
pname = "dnssec";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
cstruct
diff --git a/pkgs/development/ocaml-modules/dns/mirage.nix b/pkgs/development/ocaml-modules/dns/mirage.nix
index 3c69788e634d..640578831b22 100644
--- a/pkgs/development/ocaml-modules/dns/mirage.nix
+++ b/pkgs/development/ocaml-modules/dns/mirage.nix
@@ -4,6 +4,7 @@ buildDunePackage {
pname = "dns-mirage";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
dns
diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix
index a262280a460a..0ee30835588d 100644
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@@ -8,6 +8,7 @@ buildDunePackage {
pname = "dns-resolver";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
dns
diff --git a/pkgs/development/ocaml-modules/dns/server.nix b/pkgs/development/ocaml-modules/dns/server.nix
index 8570bb2491ef..794aea363bb9 100644
--- a/pkgs/development/ocaml-modules/dns/server.nix
+++ b/pkgs/development/ocaml-modules/dns/server.nix
@@ -7,6 +7,7 @@ buildDunePackage {
pname = "dns-server";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
dns
diff --git a/pkgs/development/ocaml-modules/dns/stub.nix b/pkgs/development/ocaml-modules/dns/stub.nix
index 17d5c0029b1d..943d28a57c5b 100644
--- a/pkgs/development/ocaml-modules/dns/stub.nix
+++ b/pkgs/development/ocaml-modules/dns/stub.nix
@@ -7,6 +7,7 @@ buildDunePackage {
pname = "dns-stub";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
dns
diff --git a/pkgs/development/ocaml-modules/dns/tsig.nix b/pkgs/development/ocaml-modules/dns/tsig.nix
index 9ca078674a96..3ecc90d39853 100644
--- a/pkgs/development/ocaml-modules/dns/tsig.nix
+++ b/pkgs/development/ocaml-modules/dns/tsig.nix
@@ -4,6 +4,7 @@ buildDunePackage {
pname = "dns-tsig";
inherit (dns) version src;
+ duneVersion = "3";
propagatedBuildInputs = [
mirage-crypto
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
index e8d71aa321e0..8c4d4e8c23c4 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
@@ -1,6 +1,10 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox
, ffmpeg-base ? callPackage ./base.nix { }
-, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }:
+, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+, stdenv
+, VideoToolbox
+}:
buildDunePackage {
pname = "ffmpeg-av";
@@ -10,7 +14,7 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
index 8ee5428c473e..442c80ab6a12 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
@@ -1,6 +1,9 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg-avutil, ffmpeg
+, stdenv
+, VideoToolbox
}:
buildDunePackage {
@@ -11,7 +14,8 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ]
+ ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
index e6641a6ca030..72180afb9614 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
@@ -1,6 +1,14 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AppKit
+, AudioToolbox
+, Cocoa
+, CoreImage
+, ForceFeedback
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg-av, ffmpeg
+, OpenGL
+, stdenv
+, VideoToolbox
}:
buildDunePackage {
@@ -11,7 +19,8 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ]
+ ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
index 6479bbe55bf6..3b3b94988b17 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
@@ -1,6 +1,11 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AppKit
+, CoreImage
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg-avutil, ffmpeg
+, OpenGL
+, stdenv
+, VideoToolbox
}:
buildDunePackage {
@@ -11,7 +16,8 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ]
+ ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
index 121fb115146e..7635fb6d1218 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
@@ -1,4 +1,5 @@
-{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox, VideoToolbox
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg
}:
@@ -11,7 +12,7 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
propagatedBuildInputs = [ ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
index 92011e48eab6..801e00b6155f 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
@@ -1,6 +1,8 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+, stdenv
+, VideoToolbox
}:
buildDunePackage {
@@ -11,7 +13,7 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
index 9d97b722551b..f39ffbc96fa0 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
@@ -1,6 +1,8 @@
{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
, ffmpeg-base ? callPackage ./base.nix { }
, ffmpeg-avutil, ffmpeg
+, stdenv
+, VideoToolbox
}:
buildDunePackage {
@@ -11,7 +13,7 @@ buildDunePackage {
inherit (ffmpeg-base) version src useDune2;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];
doCheck = true;
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index f1c4cccb51ad..1d0c10df503f 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -11,6 +11,7 @@ buildDunePackage rec {
version = "3.10.1";
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix
index 09f4757041af..c96b762189d6 100644
--- a/pkgs/development/ocaml-modules/graphql/cohttp.nix
+++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix
@@ -8,7 +8,7 @@ buildDunePackage rec {
inherit (graphql) version src;
- useDune2 = true;
+ duneVersion = "3";
nativeBuildInputs = [ ocaml-crunch ];
propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];
diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix
index 5bf61789e83a..679d89f44b10 100644
--- a/pkgs/development/ocaml-modules/graphql/default.nix
+++ b/pkgs/development/ocaml-modules/graphql/default.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
inherit (graphql_parser) version src;
+ duneVersion = "3";
+
propagatedBuildInputs = [ graphql_parser rresult yojson ];
checkInputs = [ alcotest ];
diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix
index 8fd6abfb8fb4..cbdcba64abb4 100644
--- a/pkgs/development/ocaml-modules/graphql/lwt.nix
+++ b/pkgs/development/ocaml-modules/graphql/lwt.nix
@@ -5,6 +5,8 @@ buildDunePackage rec {
inherit (graphql) version src;
+ duneVersion = "3";
+
propagatedBuildInputs = [ graphql ocaml_lwt ];
checkInputs = [ alcotest ];
diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix
index ce953a68b3c2..4042e65772bc 100644
--- a/pkgs/development/ocaml-modules/graphql/parser.nix
+++ b/pkgs/development/ocaml-modules/graphql/parser.nix
@@ -5,6 +5,7 @@ buildDunePackage rec {
version = "0.14.0";
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix
index 4ef3e98cb75e..34407299914a 100644
--- a/pkgs/development/ocaml-modules/gstreamer/default.nix
+++ b/pkgs/development/ocaml-modules/gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }:
buildDunePackage rec {
pname = "gstreamer";
@@ -12,7 +12,7 @@ buildDunePackage rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ dune-configurator ];
+ buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ];
propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ];
CFLAGS_COMPILE = [
diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
index 0c3109106c3d..d5b0691fdffa 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
@@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "happy-eyeballs";
- version = "0.3.0";
+ version = "0.4.0";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
- sha256 = "17mnid1gvq1ml1zmqzn0m6jmrqw4kqdrjqrdsrphl5kxxyhs03m6";
+ hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ=";
};
strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
index e9b260b2c144..9160b9233fa5 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
@@ -17,6 +17,7 @@ buildDunePackage {
inherit (happy-eyeballs) src version;
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
index c30348777634..22f17111e44b 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
@@ -19,6 +19,7 @@ buildDunePackage {
inherit (happy-eyeballs) src version;
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index fd7e59424547..4d5c4ae303e8 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }:
+{ stdenv, lib, makeWrapper, fetchzip, Cocoa, ocaml, findlib, tcl, tk }:
let
params =
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-labltk";
nativeBuildInputs = [ ocaml findlib makeWrapper ];
- buildInputs = [ tcl tk ];
+ buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];
dontAddPrefix = true;
diff --git a/pkgs/development/ocaml-modules/letsencrypt/app.nix b/pkgs/development/ocaml-modules/letsencrypt/app.nix
index 1f6cc6e2b103..b2d8b3c22073 100644
--- a/pkgs/development/ocaml-modules/letsencrypt/app.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix
@@ -17,12 +17,12 @@
buildDunePackage {
pname = "letsencrypt-app";
+ duneVersion = "3";
+ minimalOCamlVersion = "4.08";
inherit (letsencrypt)
src
version
- useDune2
- minimumOCamlVersion
;
buildInputs = [
diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix
index a0646517b1bc..13875147a4e5 100644
--- a/pkgs/development/ocaml-modules/letsencrypt/default.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix
@@ -25,11 +25,11 @@ buildDunePackage rec {
src = fetchurl {
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
- sha256 = "f90875f5c9bdcab4c8be5ec7ebe9ea763030fa708e02857300996bb16e7c2070";
+ hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA=";
};
- minimumOCamlVersion = "4.08";
- useDune2 = true;
+ minimalOCamlVersion = "4.08";
+ duneVersion = "3";
buildInputs = [
fmt
diff --git a/pkgs/development/ocaml-modules/letsencrypt/dns.nix b/pkgs/development/ocaml-modules/letsencrypt/dns.nix
index 99058f48d069..6465c8c72202 100644
--- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix
@@ -11,12 +11,12 @@
buildDunePackage {
pname = "letsencrypt-dns";
+ duneVersion = "3";
+ minimalOCamlVersion = "4.08";
inherit (letsencrypt)
version
src
- useDune2
- minimumOCamlVersion
;
propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix
index 25169c7c4913..097ecb313534 100644
--- a/pkgs/development/ocaml-modules/mimic/default.nix
+++ b/pkgs/development/ocaml-modules/mimic/default.nix
@@ -8,6 +8,7 @@ buildDunePackage rec {
version = "0.0.6";
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
src = fetchurl {
url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
diff --git a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix
index 72e3f99ddbe7..193509dd4903 100644
--- a/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix
+++ b/pkgs/development/ocaml-modules/mimic/happy-eyeballs.nix
@@ -6,6 +6,7 @@ buildDunePackage {
inherit (mimic) src version;
minimalOCamlVersion = "4.08";
+ duneVersion = "3";
strictDeps = true;
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index c321ca2bcb47..67741516af19 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:
+{ lib, stdenv, fetchFromGitLab, libvirt, AppKit, Foundation, autoreconfHook, pkg-config, ocaml, findlib, perl }:
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
"libvirt is not available for OCaml ${ocaml.version}"
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ];
+ buildInputs = lib.optionals stdenv.isDarwin [
+ Foundation
+ AppKit
+ ];
+
strictDeps = true;
buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ];
diff --git a/pkgs/development/ocaml-modules/resto/acl.nix b/pkgs/development/ocaml-modules/resto/acl.nix
index 0eed996289da..92a1b751ed5d 100644
--- a/pkgs/development/ocaml-modules/resto/acl.nix
+++ b/pkgs/development/ocaml-modules/resto/acl.nix
@@ -5,6 +5,7 @@ buildDunePackage {
inherit (resto) src version meta doCheck;
minimalOCamlVersion = "4.10";
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/resto/cohttp-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-client.nix
index dd0db02cdd57..fe6dd6b506e1 100644
--- a/pkgs/development/ocaml-modules/resto/cohttp-client.nix
+++ b/pkgs/development/ocaml-modules/resto/cohttp-client.nix
@@ -9,6 +9,7 @@
buildDunePackage {
pname = "resto-cohttp-client";
inherit (resto) src version meta doCheck;
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix
index c01fb1db9053..fac4ce7422ac 100644
--- a/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix
+++ b/pkgs/development/ocaml-modules/resto/cohttp-self-serving-client.nix
@@ -13,6 +13,7 @@
buildDunePackage {
pname = "resto-cohttp-self-serving-client";
inherit (resto) src version meta doCheck;
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/resto/cohttp-server.nix b/pkgs/development/ocaml-modules/resto/cohttp-server.nix
index 29e18aa88b16..6347b8628b39 100644
--- a/pkgs/development/ocaml-modules/resto/cohttp-server.nix
+++ b/pkgs/development/ocaml-modules/resto/cohttp-server.nix
@@ -12,6 +12,7 @@
buildDunePackage {
pname = "resto-cohttp-server";
inherit (resto) src version meta doCheck;
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/resto/cohttp.nix b/pkgs/development/ocaml-modules/resto/cohttp.nix
index 4de70b1dfef6..f495cadbf48f 100644
--- a/pkgs/development/ocaml-modules/resto/cohttp.nix
+++ b/pkgs/development/ocaml-modules/resto/cohttp.nix
@@ -3,6 +3,7 @@
buildDunePackage {
pname = "resto-cohttp";
inherit (resto) src version meta doCheck;
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix
index 03795e5e1cf2..0d67ca947751 100644
--- a/pkgs/development/ocaml-modules/resto/default.nix
+++ b/pkgs/development/ocaml-modules/resto/default.nix
@@ -3,6 +3,7 @@
buildDunePackage rec {
pname = "resto";
version = "1.0";
+ duneVersion = "3";
src = fetchFromGitLab {
owner = "nomadic-labs";
repo = "resto";
diff --git a/pkgs/development/ocaml-modules/resto/directory.nix b/pkgs/development/ocaml-modules/resto/directory.nix
index 555ec590ffd7..efbb7cb608e7 100644
--- a/pkgs/development/ocaml-modules/resto/directory.nix
+++ b/pkgs/development/ocaml-modules/resto/directory.nix
@@ -3,6 +3,7 @@
buildDunePackage {
pname = "resto-directory";
inherit (resto) src version meta doCheck;
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/resto/json.nix b/pkgs/development/ocaml-modules/resto/json.nix
index dbb81fd35a62..c0f9b00d6ad7 100644
--- a/pkgs/development/ocaml-modules/resto/json.nix
+++ b/pkgs/development/ocaml-modules/resto/json.nix
@@ -3,6 +3,7 @@
buildDunePackage {
pname = "resto-json";
inherit (resto) src version meta doCheck;
+ duneVersion = "3";
propagatedBuildInputs = [
resto
diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix
index 9fed705ce3ee..1aca2da2974c 100644
--- a/pkgs/development/ocaml-modules/telegraml/default.nix
+++ b/pkgs/development/ocaml-modules/telegraml/default.nix
@@ -10,6 +10,7 @@
buildDunePackage rec {
pname = "telegraml";
version = "unstable-2021-06-17";
+ duneVersion = "3";
src = fetchFromGitHub {
owner = "nv-vn";
diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix
index c7ad92efe768..9f8749cac9fd 100644
--- a/pkgs/development/ocaml-modules/webmachine/default.nix
+++ b/pkgs/development/ocaml-modules/webmachine/default.nix
@@ -6,9 +6,9 @@
buildDunePackage rec {
pname = "webmachine";
version = "0.7.0";
- useDune2 = true;
+ duneVersion = "3";
- minimumOCamlVersion = "4.04";
+ minimalOCamlVersion = "4.03";
src = fetchFromGitHub {
owner = "inhabitedtype";
@@ -24,7 +24,7 @@ buildDunePackage rec {
doCheck = true;
meta = {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/inhabitedtype/ocaml-webmachine";
license = lib.licenses.bsd3;
description = "A REST toolkit for OCaml";
maintainers = [ lib.maintainers.vbgl ];
diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix
index a713713cead6..27475fc2a09f 100644
--- a/pkgs/development/python-modules/aioaladdinconnect/default.nix
+++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioaladdinconnect";
- version = "0.1.50";
+ version = "0.1.52";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "AIOAladdinConnect";
inherit version;
- hash = "sha256-5IeqIEIQzPq5GkuAf/92J0SBI3Lu1ftJ4UOj4oQLQC4=";
+ hash = "sha256-lpEpdc2izNP1xSnGsG1WMvrRqRToNrLpZn225XnZ+pI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix
index 436014106066..a5d7d153cf03 100644
--- a/pkgs/development/python-modules/aiowebostv/default.nix
+++ b/pkgs/development/python-modules/aiowebostv/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aiowebostv";
- version = "0.2.1";
+ version = "0.3.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-r/XdxF7/g6uDQIATi/OC6lNTUtBZg1jdgZHZilPPFNc=";
+ hash = "sha256-W9RexBXo0yZStyFEAf7z5ki8tTHkc2RLD3wkX6nQsCE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix
index 15234692a8a2..ace3d711b9ca 100644
--- a/pkgs/development/python-modules/ansible-later/default.nix
+++ b/pkgs/development/python-modules/ansible-later/default.nix
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "ansible-later";
- version = "3.0.2";
+ version = "3.1.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-+UcrkITiRrAKo5MFcsSqEpvzuo4Czv+rHMWsnuvVx5o=";
+ hash = "sha256-Mi8CJ3OU27zJ2PNkrqu0BytTI5ZaQezi8DIW3yXCzDI=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix
index e577a1e508a4..e5a98bb27d22 100644
--- a/pkgs/development/python-modules/gitpython/default.nix
+++ b/pkgs/development/python-modules/gitpython/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "gitpython";
- version = "3.1.29";
+ version = "3.1.30";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gitpython-developers";
repo = "GitPython";
rev = version;
- hash = "sha256-RNDBoGWnkirPZjxn5oqH3zwYqVFLedNrSRpZOHU0j+w=";
+ hash = "sha256-odtYBQLscncdC+NbDC9D84QQveDoimkQ6RzUQLJgizI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 21db9ecf9dfb..7eb18967031e 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "google-cloud-language";
- version = "2.7.0";
+ version = "2.8.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-2BVkbQt6y9WGLjFBCt4pXPtGcmcsF8FxThOUIu7CgR8=";
+ hash = "sha256-LEExcED6vlv2Lhto+KyLiz8uyDTa+rHLySUNDZpHGe4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 83e17cd096b1..26f228ca2a63 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
- version = "2.13.11";
+ version = "2.13.12";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-CFh47PuzmR/qavOgEaot2fVBXRnHYNDemlhSTSqhut4=";
+ hash = "sha256-/qa/3RKWC0SDgDeax/CwiZtSc9Nxm1cHJAKT6si2ecw=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix
index 35829044c3cf..af61434abd6f 100644
--- a/pkgs/development/python-modules/pook/default.nix
+++ b/pkgs/development/python-modules/pook/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pook";
- version = "1.0.2";
+ version = "1.1.0";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "h2non";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-5hVRyZCA5VzufiYh1l9ezob1iuT8/VXhuFjC0OjGsbQ=";
};
propagatedBuildInputs = [
@@ -36,11 +36,14 @@ buildPythonPackage rec {
pytestCheckHook
];
- pythonImportsCheck = [ "pook" ];
+ pythonImportsCheck = [
+ "pook"
+ ];
meta = with lib; {
description = "HTTP traffic mocking and testing made simple in Python";
homepage = "https://github.com/h2non/pook";
+ changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix
index dea53f6bb091..372b1cb02143 100644
--- a/pkgs/development/python-modules/pyinfra/default.nix
+++ b/pkgs/development/python-modules/pyinfra/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pyinfra";
- version = "2.6";
+ version = "2.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Fizzadar";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-SNeucJvjnwQ0o+gukXwEKybBaW01hPtYXCFcPeOuXA8=";
+ hash = "sha256-TpO91YVWswcdpV4z9jkxBELwsIIGvlpL3URQTjAAkUs=";
};
propagatedBuildInputs = [
@@ -63,7 +63,8 @@ buildPythonPackage rec {
pyinfra automates/provisions/manages/deploys infrastructure. It can be used for
ad-hoc command execution, service deployment, configuration management and more.
'';
- homepage = "https://github.com/Fizzadar/pyinfra";
+ homepage = "https://pyinfra.com";
+ downloadPage = "https://pyinfra.com/Fizzadar/pyinfra/releases";
changelog = "https://github.com/Fizzadar/pyinfra/blob/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ totoroot ];
license = licenses.mit;
diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 91f09cc531ff..fea8da2148ef 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pylitterbot";
- version = "2023.1.0";
+ version = "2023.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "natekspencer";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-XUiDZW3r8I8Vyx30UhopQ6S0HpSi0VNgvyu2RMNt2Eg=";
+ hash = "sha256-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 4f0b96fed32c..ffcdbf5675be 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pytibber";
- version = "0.26.7";
+ version = "0.26.8";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = "refs/tags/${version}";
- hash = "sha256-T2J31+H/cO000qi2AlEGaFtAu0fl7u1LAA/QUxRAiK8=";
+ hash = "sha256-q3mlAlcetg01vHxxSIZjyDPxAqUWcdyzK4qsVmQAreA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 2a0d74c84f08..80435a738d58 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
-, makeDesktopItem
, atomicwrites
, chardet
, cloudpickle
@@ -105,16 +104,6 @@ buildPythonPackage rec {
# There is no test for spyder
doCheck = false;
- desktopItem = makeDesktopItem {
- name = "Spyder";
- exec = "spyder";
- icon = "spyder";
- comment = "Scientific Python Development Environment";
- desktopName = "Spyder";
- genericName = "Python IDE";
- categories = [ "Development" "IDE" ];
- };
-
postPatch = ''
# Remove dependency on pyqtwebengine
# This is still part of the pyqt 5.11 version we have in nixpkgs
@@ -128,11 +117,6 @@ buildPythonPackage rec {
# Add Python libs to env so Spyder subprocesses
# created to run compute kernels don't fail with ImportErrors
wrapProgram $out/bin/spyder --prefix PYTHONPATH : "$PYTHONPATH"
-
- # Create desktop item
- mkdir -p $out/share/icons
- cp spyder/images/spyder.svg $out/share/icons
- cp -r $desktopItem/share/applications/ $out/share
'';
dontWrapQtApps = true;
diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix
index 20aec3d171ff..a2b4ddabafca 100644
--- a/pkgs/development/tools/ocaml/dune-release/default.nix
+++ b/pkgs/development/tools/ocaml/dune-release/default.nix
@@ -11,6 +11,7 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ];
in buildDunePackage rec {
pname = "dune-release";
version = "1.6.2";
+ duneVersion = "3";
minimalOCamlVersion = "4.06";
diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index 45abd9cd83b4..0a69028e6bed 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "oh-my-posh";
- version = "12.35.2";
+ version = "13.0.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-6w8m7AuSEFhoYhjAJMXmwpsYuIMCvTiFKasUnBgYYCM=";
+ hash = "sha256-xsB7olfsrcgjxqNPOGiV9umtXoTtaM5E+/LTQEVLzZM=";
};
vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E=";
diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix
index 3d4b82b8edee..531772889558 100644
--- a/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/pkgs/development/tools/rust/cargo-deny/default.nix
@@ -11,19 +11,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
- version = "0.13.5";
+ version = "0.13.7";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
- sha256 = "sha256-fwuAUsqVEL9MCjNoUBPQI78u+c289cbNCB4Kh8VM/vo=";
+ sha256 = "sha256-E9tFzac6WkEGfsXj1nykQAR20+5Pi5xMd82MeDed9qg=";
};
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];
- cargoSha256 = "sha256-hnD/xZtQRVABTtdxqNcJYIsGuklNT8dxr5wpAlP/Qqs=";
+ cargoSha256 = "sha256-E3Gg7PwBNVkvX2vqtbCxz0kbe1ZWrcAWxj6OJtENBe0=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix
index 85015e713d52..a63af2476557 100644
--- a/pkgs/development/tools/rust/cargo-hack/default.nix
+++ b/pkgs/development/tools/rust/cargo-hack/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
- version = "0.5.25";
+ version = "0.5.26";
src = fetchCrate {
inherit pname version;
- sha256 = "sha256-1X2/C9JNTuRWY9nke3c7S1x5HuomDs0Em+v0P1HU4aQ=";
+ sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI=";
};
- cargoSha256 = "sha256-Ylo0HeIlXEJg6g93u4QMGTbzBtU2EpHW5BWIBDCX+EU=";
+ cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8=";
# some necessary files are absent in the crate version
doCheck = false;
diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix
index 75ed66c01e00..9fd89c062e46 100644
--- a/pkgs/games/runescape-launcher/default.nix
+++ b/pkgs/games/runescape-launcher/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook
, gnome2, xorg
-, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl
+, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl_1_1
, libpulseaudio
, SDL2, xorg_sys_opengl, libGL
}:
@@ -34,7 +34,7 @@ let
cairo
gtk2-x11
zlib
- openssl
+ openssl_1_1
];
runtimeDependencies = [
@@ -42,7 +42,7 @@ let
libGL
SDL2
xorg_sys_opengl
- openssl
+ openssl_1_1
zlib
];
@@ -96,7 +96,7 @@ in
targetPkgs = pkgs: [
runescape
dpkg glibc gcc-unwrapped
- libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl
+ libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl_1_1
libpulseaudio
xorg.libX11
SDL2 xorg_sys_opengl libGL
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 0d38dcbf02d5..7a7a6de5dad4 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "bind";
- version = "9.18.9";
+ version = "9.18.10";
src = fetchurl {
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-apZlmY1WhgRGDfCRj8jM+tfSk4jU2EJWDAVswhHLskM=";
+ sha256 = "sha256-9BWpL+tiVotQhUoGPLIx4lc1H4ZyGG0KsDGkmz3iysY=";
};
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 906585f10b26..46d10548161b 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.1.3";
+ version = "2023.1.4";
components = {
"3_day_blinds" = ps: with ps; [
];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 420bc78690ba..d0fdfa16be00 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -195,7 +195,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.1.3";
+ hassVersion = "2023.1.4";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -213,7 +213,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
- hash = "sha256-BYUh6rOW6GgOSaN9zDtwn+aiHcNI5BBns9jPc3A3DdI=";
+ hash = "sha256-up6AKdrbiLuVf58yDUGlNME7qVFbegnnb3zoTF4Gj3s=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 5870e1c3029a..88c7c5a3def9 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -16,13 +16,13 @@
buildGoModule rec {
pname = "evcc";
- version = "0.111.0";
+ version = "0.111.1";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
- hash = "sha256-amXB4iLZJXJuU4gaTSpDc+kNoTVx08EUis0ld0XtcMs=";
+ hash = "sha256-2ZxEUhDNF2E5http8Pz21L0tw6r4UOK5XYDXbHJDnEU=";
};
vendorHash = "sha256-+qne/eB+z8e0vStC9V0w7jgWgo3vvkaR42dUe+/eXDE=";
diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json
index b41eddff1e46..005627dd7e9d 100644
--- a/pkgs/servers/invidious/versions.json
+++ b/pkgs/servers/invidious/versions.json
@@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
- "rev": "927c37ce3eb306fe6a02c0fdb9e3ee0a837e84d2",
- "sha256": "sha256-l5DDSopd4ueA0IoPovIPjGqCm3LZE8802Sh2EduLtuU=",
- "version": "unstable-2023-01-08"
+ "rev": "05258d56bdc3f4de1f0da0c0dbd2d540f68cbdd5",
+ "sha256": "sha256-5vA9LCtHgXj7Pn5U/oLDKnwR/ZNtayl2QBA9jkzs98E=",
+ "version": "unstable-2023-01-10"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",
diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix
index 4dbc9f6a5050..60c073e3a828 100644
--- a/pkgs/servers/libreddit/default.nix
+++ b/pkgs/servers/libreddit/default.nix
@@ -3,31 +3,21 @@
, nixosTests
, rustPlatform
, fetchFromGitHub
-, fetchpatch
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "libreddit";
- version = "0.27.0";
+ version = "0.27.1";
src = fetchFromGitHub {
owner = "libreddit";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-+sSzYewqN3VjTl+wjgan3yxlFiuCg2rprJDpDktuQHo=";
+ hash = "sha256-3Q/Vl126EMRSNdStpZqFEkA0Kjzu6BeyBhokTQrrQXE=";
};
- cargoSha256 = "sha256-HhtslN6JV9DUBhuyesciZGGYVz7mvpdyxVps9xAc+Rs=";
-
- patches = [
- # https://github.com/libreddit/libreddit/pull/687
- (fetchpatch {
- name = "fix-cfg-test.patch";
- url = "https://github.com/libreddit/libreddit/commit/dff91da8777dc42d38abf8b5d63addbd71fdabff.patch";
- sha256 = "sha256-6np5gf8cyKotF7KJ19mCtRAF7SxDpNFpQCgdy/XDsng=";
- })
- ];
+ cargoSha256 = "sha256-TA0Rsya3vx6N/iAWpRmB7Byz7AIR0sdfk3kJ8wgvWHY=";
buildInputs = lib.optionals stdenv.isDarwin [
Security
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 19a81db9a364..9eacea78a37e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -96,6 +96,9 @@ let
# to pass in java explicitly.
"-DCONNECT_WITH_JDBC=OFF"
"-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
+ ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionAtLeast version "10.6") [
+ # workaround for https://jira.mariadb.org/browse/MDEV-29925
+ "-Dhave_C__Wl___as_needed="
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
# revisit this if nixpkgs supports any architecture whose stack grows upwards
"-DSTACK_DIRECTION=-1"
@@ -238,36 +241,36 @@ in
self: {
mariadb_104 = self.callPackage generic {
# Supported until 2024-06-18
- version = "10.4.26";
- hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8=";
+ version = "10.4.27";
+ hash = "sha256-SKHyIMoYuwxGN513/pjrdQvMcFLnPxDjJ26ipcUbirI=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_105 = self.callPackage generic {
# Supported until 2025-06-24
- version = "10.5.17";
- hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E=";
+ version = "10.5.18";
+ hash = "sha256-NZOw3MDy6A6YF3AZ9dz6XMjBQXLOFhpvpQ+AhPLO90k=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_106 = self.callPackage generic {
# Supported until 2026-07
- version = "10.6.10";
- hash = "sha256-atn6hvDIXI7q+tJkNUnV/13ShyAClk51R1LekYY6o7c=";
+ version = "10.6.11";
+ hash = "sha256-V4S6TF2Hk7rbpYNIV2gk2YSewVLpy+5HoXZRYdhAyUo=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_108 = self.callPackage generic {
# Supported until 2023-05
- version = "10.8.5";
- hash = "sha256-z37TjDYTTNgYP93WTLPlD1ROgmS6dCAlXbEpcJfgjos=";
+ version = "10.8.6";
+ hash = "sha256-qal8eZtpnhDJOWW71wQ0U/eiDhQL0inSCaoWFvKfv20=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
mariadb_109 = self.callPackage generic {
# Supported until 2023-08
- version = "10.9.3";
- hash = "sha256-mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=";
+ version = "10.9.4";
+ hash = "sha256-Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ=";
inherit (self.darwin) cctools;
inherit (self.darwin.apple_sdk.frameworks) CoreServices;
};
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index 1328020d96d4..8956b54932a8 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spaceship-prompt";
- version = "4.12.0";
+ version = "4.13.1";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZL6z5pj2xbnUZl4SK7wxiJjheUY79hwDNVYm9+biKZU=";
+ sha256 = "sha256-NGm5uM85ThVBSnwMF//drr4GBiYv5JXZU6ZmbjQ2fLU=";
};
strictDeps = true;
diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix
new file mode 100644
index 000000000000..f78723ee6e2b
--- /dev/null
+++ b/pkgs/shells/zsh/zimfw/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "zimfw";
+ version = "1.11.0";
+ src = fetchFromGitHub {
+ owner = "zimfw";
+ repo = "zimfw";
+ rev = "v${version}";
+ ## zim only needs this one file to be installed.
+ sparseCheckout = [ "zimfw.zsh" ];
+ sha256 = "sha256-BmzYAgP5Z77VqcpAB49cQLNuvQX1qcKmAh9BuXsy2pA=";
+ };
+ strictDeps = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r $src/zimfw.zsh $out/
+
+ runHook postInstall
+ '';
+
+ ## zim automates the downloading of any plugins you specify in the `.zimrc`
+ ## file. To do that with Nix, you'll need $ZIM_HOME to be writable.
+ ## `~/.cache/zim` is a good place for that. The problem is that zim also
+ ## looks for `zimfw.zsh` there, so we're going to tell it here to look for
+ ## the `zimfw.zsh` where we currently are.
+ postFixup = ''
+ substituteInPlace $out/zimfw.zsh \
+ --replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh"
+ '';
+
+ meta = with lib; {
+ description =
+ "The Zsh configuration framework with blazing speed and modular extensions";
+ homepage = "https://zimfw.sh";
+ license = licenses.mit;
+ maintainers = [ maintainers.joedevivo ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix
index ecf2a4bf0e5a..18ffdb71cde4 100644
--- a/pkgs/tools/misc/fend/default.nix
+++ b/pkgs/tools/misc/fend/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3A+MxRonN1dhF7PrsGgc6zai1TQ9K8YIyqD0lqa3/EY=";
+ sha256 = "sha256-jg2rMiFXtN3oLru1gTaTyIo5eBEI23paKJiDV6KZZE4=";
};
- cargoSha256 = "sha256-VgueZKMDI35ERQR+V2SFxnUplHFS0LbJlGb/bRXUYWk=";
+ cargoHash = "sha256-9Gri/EBaUiCpFBL0f132JDD4Zl5v40e8JmlRvm019S4=";
nativeBuildInputs = [ pandoc installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/tools/misc/ghostie/default.nix
index 61143ed7d1bd..40e30b3867f5 100644
--- a/pkgs/tools/misc/ghostie/default.nix
+++ b/pkgs/tools/misc/ghostie/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "ghostie";
- version = "0.2.1";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "attriaayush";
repo = "ghostie";
rev = "v${version}";
- sha256 = "sha256-O05PJa4YFD8+9BOojS7Ti1OYGxaROFKyGT9VJf5V58U=";
+ sha256 = "sha256-kdDdKI4nJqomA2h370JT180qQ+EkcLaF4NAG+PjydGE=";
};
- cargoSha256 = "sha256-YF808suqfeM156KkRGCCtGFsCdgQ4eu6n2P6yAVV7qc=";
+ cargoHash = "sha256-NI4V3j92OqBk99lDe6hJgaHmGRdEle7prayo2uGF7CE=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix
index 0cb2fcf3b9b7..9e27cf7039f4 100644
--- a/pkgs/tools/networking/gobgp/default.nix
+++ b/pkgs/tools/networking/gobgp/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gobgp";
- version = "3.9.0";
+ version = "3.10.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "v${version}";
- sha256 = "sha256-W03RUxuDo5+YiHAf7yIfzYl0zXi7fwQf1DBqcgLejJs=";
+ sha256 = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM=";
};
- vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4=";
+ vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk=";
postConfigure = ''
export CGO_ENABLED=0
diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix
index 3a985bee371d..cea88a31f600 100644
--- a/pkgs/tools/system/automatic-timezoned/default.nix
+++ b/pkgs/tools/system/automatic-timezoned/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "automatic-timezoned";
- version = "1.0.53";
+ version = "1.0.55";
src = fetchFromGitHub {
owner = "maxbrunet";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-HxlaJwrek01yM8CDeaZ24lKBsA3VuanTcMNxnf4MwZc=";
+ sha256 = "sha256-80GP7w3YF7RNMTlSI5SCQfugjkNBweX5BcYk4ODimBQ=";
};
- cargoSha256 = "sha256-jz58E7t8UfYezVozc95ncK96Sv3zHv4jSzgNQjsGc+k=";
+ cargoHash = "sha256-WtqK8T/3Mo/y3cPn8d6kDzC59qE70JUHFdHk7mFpP1k=";
meta = with lib; {
description = "Automatically update system timezone based on location";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f50f92d1994d..40a029ab16e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1692,6 +1692,8 @@ with pkgs;
git-bug = callPackage ../applications/version-management/git-bug { };
+ git-bug-migration = callPackage ../applications/version-management/git-bug-migration { };
+
git-chglog = callPackage ../applications/version-management/git-chglog { };
git-cinnabar = callPackage ../applications/version-management/git-cinnabar {
@@ -7730,6 +7732,10 @@ with pkgs;
libdevil = libdevil-nox;
};
+ gridtracker = callPackage ../applications/radio/gridtracker { };
+
+ grig = callPackage ../applications/radio/grig { };
+
grin = callPackage ../tools/text/grin { };
gyb = callPackage ../tools/backup/gyb { };
@@ -13498,6 +13504,8 @@ with pkgs;
zim-tools = callPackage ../tools/text/zim-tools { };
+ zimfw = callPackage ../shells/zsh/zimfw { };
+
zld = callPackage ../development/tools/zld { };
par = callPackage ../tools/text/par { };
@@ -18794,6 +18802,8 @@ with pkgs;
};
});
+ calcium = callPackage ../development/libraries/calcium {};
+
cubeb = callPackage ../development/libraries/audio/cubeb {
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices;
};
@@ -37732,6 +37742,8 @@ with pkgs;
terranix = callPackage ../applications/networking/cluster/terranix {};
+ terraspace = callPackage ../applications/networking/cluster/terraspace {};
+
tfswitch = callPackage ../applications/networking/cluster/tfswitch {};
tgswitch = callPackage ../applications/networking/cluster/tgswitch {};
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ee3b3ad21a1a..f037f5b7cc9d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -86,7 +86,9 @@ let
bitv = callPackage ../development/ocaml-modules/bitv { };
- bjack = callPackage ../development/ocaml-modules/bjack { };
+ bjack = callPackage ../development/ocaml-modules/bjack {
+ inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreAudio;
+ };
bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };
@@ -450,24 +452,31 @@ let
ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { };
ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox;
};
ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox;
};
ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox;
};
ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox;
};
ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix {
inherit (pkgs) ffmpeg;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox;
};
fiber = callPackage ../development/ocaml-modules/fiber { };
@@ -524,7 +533,9 @@ let
inherit (pkgs) gsl;
};
- gstreamer = callPackage ../development/ocaml-modules/gstreamer { };
+ gstreamer = callPackage ../development/ocaml-modules/gstreamer {
+ inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation;
+ };
h2 = callPackage ../development/ocaml-modules/h2 { };
@@ -707,7 +718,9 @@ let
then callPackage ../development/ocaml-modules/lablgtk-extras { }
else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { };
- labltk = callPackage ../development/ocaml-modules/labltk { };
+ labltk = callPackage ../development/ocaml-modules/labltk {
+ inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
+ };
lacaml = callPackage ../development/ocaml-modules/lacaml { };
@@ -1000,7 +1013,9 @@ let
ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { };
- ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { };
+ ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt {
+ inherit (pkgs.darwin.apple_sdk.frameworks) Foundation AppKit;
+ };
ocamlify = callPackage ../development/tools/ocaml/ocamlify { };