diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index 9e5d4bfd20d9..bdd55a59370b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -488,6 +488,16 @@
instead.
+
+
+ The p4 package now only includes the
+ open-source Perforce Helix Core command-line client and APIs.
+ It no longer installs the unfree Helix Core Server binaries
+ p4d, p4broker, and
+ p4p. To install the Helix Core Server
+ binaries, use the p4d package instead.
+
+
The coq package and versioned variants
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 47f3da3a435a..69e0cbd2ad51 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -162,6 +162,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- `services.hbase` has been renamed to `services.hbase-standalone`.
For production HBase clusters, use `services.hadoop.hbase` instead.
+- The `p4` package now only includes the open-source Perforce Helix Core command-line client and APIs. It no longer installs the unfree Helix Core Server binaries `p4d`, `p4broker`, and `p4p`. To install the Helix Core Server binaries, use the `p4d` package instead.
+
- The `coq` package and versioned variants starting at `coq_8_14` no
longer include CoqIDE, which is now available through
`coqPackages.coqide`. It is still possible to get CoqIDE as part of
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 685008b09b04..c415ca857437 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -1,7 +1,7 @@
# This module defines the software packages included in the "minimal"
# installation CD. It might be useful elsewhere.
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
{
# Include some utilities that are useful for installing or repairing
diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix
index 6c648ed71159..3b12aeb88684 100644
--- a/pkgs/applications/audio/blanket/default.nix
+++ b/pkgs/applications/audio/blanket/default.nix
@@ -4,7 +4,7 @@
, meson
, ninja
, pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
, desktop-file-utils
, appstream-glib
, python3Packages
@@ -30,9 +30,8 @@ python3Packages.buildPythonApplication rec {
meson
ninja
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
desktop-file-utils
- appstream-glib
];
buildInputs = [
@@ -57,6 +56,8 @@ python3Packages.buildPythonApplication rec {
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
+ substituteInPlace build-aux/meson/postinstall.py \
+ --replace gtk-update-icon-cache gtk4-update-icon-cache
'';
meta = with lib; {
diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix
index e995f8cfa1b9..af1dfb01e9ae 100644
--- a/pkgs/applications/audio/spot/default.nix
+++ b/pkgs/applications/audio/spot/default.nix
@@ -16,7 +16,7 @@
, openssl
, alsa-lib
, libpulseaudio
-, wrapGAppsHook
+, wrapGAppsHook4
}:
stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x build-aux/cargo.sh
patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py
+ substituteInPlace build-aux/meson/postinstall.py \
+ --replace gtk-update-icon-cache gtk4-update-icon-cache
'';
passthru = {
diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix
index 52134d15da82..6a67d6df743c 100644
--- a/pkgs/applications/editors/rehex/default.nix
+++ b/pkgs/applications/editors/rehex/default.nix
@@ -3,41 +3,37 @@
, fetchFromGitHub
, pkg-config
, which
+, zip
+, libicns
, capstone
, jansson
, libunistring
-, lua5_3
, wxGTK31
+, lua53Packages
+, perlPackages
, Carbon
, Cocoa
, IOKit
-, libicns
-, wxmac
}:
stdenv.mkDerivation rec {
pname = "rehex";
- version = "0.4.1";
+ version = "0.5.3";
src = fetchFromGitHub {
owner = "solemnwarning";
repo = pname;
rev = version;
- hash = "sha256-NuWWaYABQDaS9wkwmXkBJWHzLFJbUUCiePNQNo4yZrk=";
+ hash = "sha256-VBHNrOVIz7UM9tY1V7Ykwt4Cv0fY++8gXc2og4sLDk8=";
};
- postPatch = ''
- # See https://github.com/solemnwarning/rehex/pull/148
- substituteInPlace Makefile.osx \
- --replace '$(filter-out %@2x.png,$(wildcard $(ICONSET)/*.png))' 'res/icon{16,32,128,256,512}.png'
- '';
-
- nativeBuildInputs = [ pkg-config which ]
+ nativeBuildInputs = [ pkg-config which zip ]
++ lib.optionals stdenv.isDarwin [ libicns ];
- buildInputs = [ capstone jansson libunistring lua5_3 ]
- ++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ]
- ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ];
+ buildInputs = [ capstone jansson libunistring wxGTK31 ]
+ ++ (with lua53Packages; [ lua busted ])
+ ++ (with perlPackages; [ perl TemplateToolkit ])
+ ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ];
makeFlags = [ "prefix=${placeholder "out"}" ]
++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ];
@@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/solemnwarning/rehex";
changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ markus1189 ];
+ maintainers = with maintainers; [ markus1189 wegank ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 3ed8976b0603..77dce00211f5 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -161,12 +161,12 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
- version = "2022-09-15";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "f090cb40eacdce71c406e466d02e3b41c03312c8";
- sha256 = "0ma65874dffpj7sc3skczlxf7gmq1v2lqi5qwqv0hgx6idqdkf1c";
+ rev = "b7bf04eaeae846168efd86ef0136394a2d128b72";
+ sha256 = "00krndb2crrcvcp8vb60wqz75pjj3121335mykaqhhq0jhc67xw2";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
};
@@ -341,12 +341,12 @@ final: prev:
SpaceVim = buildVimPluginFrom2Nix {
pname = "SpaceVim";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "SpaceVim";
repo = "SpaceVim";
- rev = "cd193b852d51dc70200fbf8f7d92f174735ee657";
- sha256 = "0syimr7v6a87fq9zvxkh8xc38102y04jm8z0g53inayamp64vz2p";
+ rev = "3bacbcd4ef84d24602799555465fed6d71fdd9b2";
+ sha256 = "1mhq6gz0maab2vvrajdcq689nr93sniw5iz75spr8vq9za9aazx0";
};
meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
};
@@ -942,12 +942,12 @@ final: prev:
bullets-vim = buildVimPluginFrom2Nix {
pname = "bullets.vim";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "dkarter";
repo = "bullets.vim";
- rev = "bb2b9f3cae530fcc9e70055243cbbdda4daa497e";
- sha256 = "1k9ynbkiag6b42zaqk7vyq2l376g5p7j8hn5xmjnmxzra1s68yx4";
+ rev = "746f92ae05cdcc988857d8e76418326f07af9494";
+ sha256 = "0zdfri31h1iv3jjw2yqkqqfd07cdk7ymyrl5n03khwh192dawd5r";
};
meta.homepage = "https://github.com/dkarter/bullets.vim/";
};
@@ -990,12 +990,12 @@ final: prev:
ccc-nvim = buildVimPluginFrom2Nix {
pname = "ccc.nvim";
- version = "2022-10-07";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "ccc.nvim";
- rev = "666a406659fadd22a9c2b0fb1fed432f4529e7f1";
- sha256 = "1cdkws7k3b55ahbhfhnqv4f47jm20n6cfgrr5yrfmplqvl2az70h";
+ rev = "e74e0ebf3fac929c81fb9d918228ef03afc8d470";
+ sha256 = "1abpkiry3ffmwj51yldiaw3ix1scr6jjx714am1d4wz7kbl4228g";
};
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
};
@@ -1506,12 +1506,12 @@ final: prev:
cmp-spell = buildVimPluginFrom2Nix {
pname = "cmp-spell";
- version = "2022-10-03";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "f3fora";
repo = "cmp-spell";
- rev = "5c32dd5c23ec31e88ed28c74231eec0c55dc8307";
- sha256 = "1w0658jgn5v1018by1912dpnxa6y25pv929awaimgzd3wlsfm89p";
+ rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa";
+ sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv";
};
meta.homepage = "https://github.com/f3fora/cmp-spell/";
};
@@ -1806,12 +1806,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "d30f2b059c0c03fcfab3842684212bac525a3d0b";
- sha256 = "0n0ybjzwfdh7dk8wk3mf77hf0v7zxakv26a9z608srdia2xa3ndr";
+ rev = "250bbc5a04b6e80ff1c212e89a80e976cda9e433";
+ sha256 = "18x9a1fmial78f28mkaqsajzazjj9zd4yq44fghw1ynaa36gjmwh";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@@ -1878,12 +1878,12 @@ final: prev:
compiler-explorer-nvim = buildVimPluginFrom2Nix {
pname = "compiler-explorer.nvim";
- version = "2022-10-07";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "krady21";
repo = "compiler-explorer.nvim";
- rev = "b611606f62b4ae0de10cc9a5565ce32f629a868a";
- sha256 = "102ic12byilviz65nnk3crwnrfsw1dqwvvfhj6gfix7ybg76vkx6";
+ rev = "b565df009e92aad6ca8b338562b2f375fb1fea96";
+ sha256 = "0855y7vhhfzv3ppmg5834k593jg4b2qlkpg45fsf4xkks3g2s168";
};
meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/";
};
@@ -2010,24 +2010,24 @@ final: prev:
coq-artifacts = buildVimPluginFrom2Nix {
pname = "coq.artifacts";
- version = "2022-10-09";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.artifacts";
- rev = "39a174683e28b7b96a4b6521d1d3d2ef3a571ce2";
- sha256 = "0wk5jgsn0k2zp4kg6rj4pagnnbmq4rbk566d01svfw6vphv4d9fc";
+ rev = "e7ce839707e349fa5d8ea494dae2490fa849a4c3";
+ sha256 = "0g10avvx8i7pgfipq2wbylk98r1xz3g1sqr4kldxkv2g48842c1v";
};
meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
};
coq-thirdparty = buildVimPluginFrom2Nix {
pname = "coq.thirdparty";
- version = "2022-10-09";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq.thirdparty";
- rev = "46dc68b8193873ce44f2f572f1f2ecb3f5cdb9a9";
- sha256 = "14z16aw60ns90yf8g5z8rcb757byrvq1c8yaw0qb6bcvvgzgpwbm";
+ rev = "9f0744543875c3bee9c124248d259d059ccdad21";
+ sha256 = "0ykh3xl37x07z9ci63rvxqp1p3sw42macl0jxskbpk338rdvw9yi";
};
meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
};
@@ -2046,12 +2046,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
- version = "2022-10-09";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
- rev = "27fb487f108d8159793f0eeb6aa1e5ee0d4da9aa";
- sha256 = "1wzwgi6czri6cnq7qws5pw97k2c81q72masn7cd7lv7dva6bzz3p";
+ rev = "cbe678af3d43772781781fa485137ea3c46ce323";
+ sha256 = "1dc6903m9qs3s9jpc676lg6970w8vb635w6mc4w72zcln8xgih56";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -3215,12 +3215,12 @@ final: prev:
gitsigns-nvim = buildNeovimPluginFrom2Nix {
pname = "gitsigns.nvim";
- version = "2022-10-07";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "9787c94178b4062f30d2f06b6d52984217196647";
- sha256 = "1w96nqwmc9y3k6wyrnbr8br1h6lwxcvyykv22320lbxipl6i8rhw";
+ rev = "9d18976c10413e52d76d41a771f042704786ce2e";
+ sha256 = "1fzmg74i9q6xal0k1s1ikgbc37s0q1z79af5vhlfll5f2c5dkpsk";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -3407,11 +3407,11 @@ final: prev:
hare-vim = buildVimPluginFrom2Nix {
pname = "hare.vim";
- version = "2022-08-27";
+ version = "2022-10-10";
src = fetchgit {
url = "https://git.sr.ht/~sircmpwn/hare.vim";
- rev = "0bdef854f8531747438f7764cf7553ba16e56fb8";
- sha256 = "15ajgvhwl63h5268kp56m741bglaq3zgcf0bv61sasrh4v97xmgz";
+ rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256";
+ sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k";
};
meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim";
};
@@ -3490,12 +3490,12 @@ final: prev:
hologram-nvim = buildVimPluginFrom2Nix {
pname = "hologram.nvim";
- version = "2022-09-03";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "edluffy";
repo = "hologram.nvim";
- rev = "338969044a5d6f9f56f728c8efeeced7408d580a";
- sha256 = "0q493i7fsws9q2wrmddbvxwr968qkkz8nlgm0nynb13m5qxpdzvh";
+ rev = "f5194f71ec1578d91b2e3119ff08e574e2eab542";
+ sha256 = "0khmi21mvmif7qd8cak9x1z4h68d34rwhfvcvnqxxh0mjzvskppv";
};
meta.homepage = "https://github.com/edluffy/hologram.nvim/";
};
@@ -3514,12 +3514,12 @@ final: prev:
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop.nvim";
- version = "2022-07-31";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "2a1b686aad85a3c241f8cd8fd42eb09c7de5ed79";
- sha256 = "1f8p8cxi74kgqs20knx7yq1bd7m30va1dqpsy5dqdzsazr50fymc";
+ rev = "6591b3656b75ff313cc38dc662a7ee8f75f1c165";
+ sha256 = "1y6jvl8q8j46zy1c18xi0hfdbma2cq7g3k0ymw05qghvvjyv65bq";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -3536,6 +3536,18 @@ final: prev:
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
+ hydra-nvim = buildVimPluginFrom2Nix {
+ pname = "hydra.nvim";
+ version = "2022-10-02";
+ src = fetchFromGitHub {
+ owner = "anuvyklack";
+ repo = "hydra.nvim";
+ rev = "fa41a971765d4cce9c39185289f5a10894f66dbd";
+ sha256 = "198bkw3y3253wjamvxxkdjr54nv1bkin148v554b47yv5w156zz1";
+ };
+ meta.homepage = "https://github.com/anuvyklack/hydra.nvim/";
+ };
+
i3config-vim = buildVimPluginFrom2Nix {
pname = "i3config.vim";
version = "2021-06-23";
@@ -3935,36 +3947,36 @@ final: prev:
leap-ast-nvim = buildVimPluginFrom2Nix {
pname = "leap-ast.nvim";
- version = "2022-08-02";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap-ast.nvim";
- rev = "38d05c808fc8cecb4c380912649d87c7abfa9e95";
- sha256 = "0d52ndk9r8g6mp09rjryz9hp7mdyfqqcjf94j0f83qdkdmv3i9gp";
+ rev = "1a21b70505ebb868a1e196c0d63797e1426b53a5";
+ sha256 = "1jb8rydp4h3b71vfn9hq4ni1fs6ds0kk92vlal4jl9gzs38cx5p9";
};
meta.homepage = "https://github.com/ggandor/leap-ast.nvim/";
};
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
- version = "2022-10-01";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
- rev = "5a09c30bf676d1392ff00eb9a41e0a1fc9b60a1b";
- sha256 = "078q9dr4a2j6c6v7l4n1ly2j94d3q4fbinpmi4qma9zmrpg9nsn6";
+ rev = "517f142dea3d62c956fd00ab78385b83b14932a9";
+ sha256 = "09j9frsxqxbzvk2fpyfz1ian9q5gzm1zj13kq64fwldzxamjsjji";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
legendary-nvim = buildVimPluginFrom2Nix {
pname = "legendary.nvim";
- version = "2022-10-07";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
- rev = "4ecafc2993b31e74bb8cecb93a90f2414f008be2";
- sha256 = "0d0qg2hs83jf26hjca7bwjxgv59zrnw4w8gm54p0fr8gaqcvr514";
+ rev = "9d8e43e25174033a1066f12b7d656d93c7527db7";
+ sha256 = "17drk65qrxnmnywg8p3251581hfy01drzj669v92brn1varp1a6d";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@@ -4211,12 +4223,12 @@ final: prev:
live-command-nvim = buildVimPluginFrom2Nix {
pname = "live-command.nvim";
- version = "2022-10-06";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "smjonas";
repo = "live-command.nvim";
- rev = "76abef7bcf40afd8db381c8d95a0f3143aa28e68";
- sha256 = "0swz1pvzl5fr57y7vzxzb9gqfmw5d3zh0751hgj7jqdy4hn00a6z";
+ rev = "b3639c1bc78dbd396b47ef1dcf624dabc01238be";
+ sha256 = "0bkffrsha1mhsnd0w45js5d0kx097k21lyg7bwj4a40icgkgyfpk";
};
meta.homepage = "https://github.com/smjonas/live-command.nvim/";
};
@@ -4366,12 +4378,12 @@ final: prev:
lua-dev-nvim = buildVimPluginFrom2Nix {
pname = "lua-dev.nvim";
- version = "2022-10-09";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "folke";
repo = "lua-dev.nvim";
- rev = "a37b9ba11a4d1ed97284b416526e6251d23d58e1";
- sha256 = "1ida1a97ddz5ps4yhxpvm9in20q8jy345a0b8kc7h4h3v0pqmdkd";
+ rev = "092306391310e0cd3b8785588c50d03a9c98d473";
+ sha256 = "0hg6mq5h6a63vnvpxjjyfx1czjj14gpjdc0cn18hnch9krr5mz1i";
};
meta.homepage = "https://github.com/folke/lua-dev.nvim/";
};
@@ -4402,12 +4414,12 @@ final: prev:
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "aa7acef98392f35288590f2fcf984b19e0d5bc29";
- sha256 = "1xs5h97q3fg4avsab9csf8nwmxadc9pvhv31khq86637kximgzz1";
+ rev = "08511f9a8dc3ef01c31a245429bfaef993e2f1f6";
+ sha256 = "04100gf6rgl3d7vxsxvf0xgn0y2ypyjh22qznx18hm0c7mdsl1qz";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -4511,12 +4523,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
- version = "2022-10-02";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "3f2c7a2aee528309fb42091b723285fb7630a0c2";
- sha256 = "18049zbm2gxm6gjif6radwy09x84ix1y30657q294n7scsh25mg5";
+ rev = "9f7bdfd90d5bdb466fd297f691db6c58316c3bb7";
+ sha256 = "11yn7jwy8vy6rzmavh420x3dn7y9lzb0dn5nkrky2rr38s6wyd5h";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -4943,12 +4955,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
- version = "2022-10-08";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
- rev = "7e56721877cb8219a6b982710d98eb675738f499";
- sha256 = "1n875jcbrqvc3gyswld3np9r7axns7v0pmd4cf0lcx64pkb3wrn2";
+ rev = "9a9891a3247b2c15b752efca749f1175b9013235";
+ sha256 = "01iibvgf5lf23zivd94dfcjiz2b0rmqcz7yddfqf8drq1pi3bxjw";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -5171,12 +5183,12 @@ final: prev:
noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim";
- version = "2022-10-08";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "folke";
repo = "noice.nvim";
- rev = "b479e237c3af7b72e26e032f790a73a9aae91897";
- sha256 = "1hv0gqs088ga60clp4dszjqsf67g6ppggmwi9h4pkyr9yni6himh";
+ rev = "87f908da660c321439a0dd98a8e51cd85227f57b";
+ sha256 = "0byzbwhclppby3ryqis29d6wpdgshk7qi9sp1pp8kkfjv2fg3xb3";
};
meta.homepage = "https://github.com/folke/noice.nvim/";
};
@@ -5243,12 +5255,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "3d76bb2968310f7e18a20711ac89c5e7b07e8c93";
- sha256 = "145dqk8423b8wnkzrv7ajvymxpsvpr2bj3malywmlyb6zkzkc8q4";
+ rev = "ce85d7738b5a29c910a970fed3299bada855fb3d";
+ sha256 = "0gnz4w8yj2d8qzx63dfyvr18sxhid3876gdaf33p0j3x138d45p1";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -5363,12 +5375,12 @@ final: prev:
nvim-cmp = buildNeovimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2022-10-07";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "0e436ee23abc6c3fe5f3600145d2a413703e7272";
- sha256 = "02w95zqbl3nx0vnl2fhlhlkil3jzy6yi2731xmy01qjl54vgqgdj";
+ rev = "0ad2450ff617a3568cc3f5e46f13635ef5185e6c";
+ sha256 = "1fgl908sv4pzqg6z4i584d86qqkf91igd0pkhggwf951x0ss4m02";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -5459,12 +5471,12 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2022-10-08";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "684f57f9d6aed53dfa349986a1038b10b759e18b";
- sha256 = "1w1ka48zhv0qgx6s03q5c9clm3y7x572q0k6qvgqlj22fcqcqph1";
+ rev = "6b12294a57001d994022df8acbe2ef7327d30587";
+ sha256 = "16v6cy2za9v48jrm4mipfnxv5ry0h60k85342xrzxwanhnkagi5v";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -5579,12 +5591,12 @@ final: prev:
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2022-09-30";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "5e6ea33cfdf8be57bb33146f1927b7723d3ddff6";
- sha256 = "0zhjsg627avq3755a9q28hy8g6iahrn17cwavx47q69j3hp0cl7q";
+ rev = "8b67dd488cc4633dc3580b44bf0b30d002a2ba29";
+ sha256 = "1wwk0sxd3j4fpndill5hbdq1rwmjfv8x8hmajvsxdnpc8skvyzxa";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -5687,12 +5699,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2022-10-07";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "9d4b8d393aad0e6e9227e2d67629aa99e56b994a";
- sha256 = "0yajlbas8ghm75d2qsngl6c72w1kk05rhpzfmsrp3yzm57jpx73v";
+ rev = "0a8064eda0c7a4475c4a8ceb39199e975308797b";
+ sha256 = "163ppl8fdybx2bkaimbxxidn6vgqgz6dz6qs45ng9f9ys1wxg5nr";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -5771,12 +5783,12 @@ final: prev:
nvim-notify = buildVimPluginFrom2Nix {
pname = "nvim-notify";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-notify";
- rev = "74eb04da1945cb4411bb7b1a4373d61b4f4c135b";
- sha256 = "05rszmk0x5xbhlprfky2kn3dm2gvbiphqcb7yj65sng4423z4g40";
+ rev = "56f65a9474e9ce294a89eb325fccf4391646bfd4";
+ sha256 = "1dr3yv8b3zv50yls8xwf6k75xk7l8y78cbbs7zvjmwri31sw5w4f";
};
meta.homepage = "https://github.com/rcarriga/nvim-notify/";
};
@@ -5883,20 +5895,20 @@ final: prev:
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
- rev = "0db49773037a399996db81bb2ba0ac5301d8bf1d";
- sha256 = "1d19hb819zxbl1vzn3d50gyhp97z818hh5q9fdgav33kkkhycc4f";
+ rev = "875d38e52cc4367bad10e648a906a6bd73b3691c";
+ sha256 = "02mqgphmmpvnwqaivy4yjgvwrhf23s1jb8z8qldgfxypf5lfpgvl";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2022-10-08";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "b273a06728305c1e7bd0179977ca48049aeff5e6";
- sha256 = "107yb35kq5c8fg2h9mr0v1wjskym9ai1wmfdr5j72gcv0zc174xj";
+ rev = "7ddc2b54db9b92846292e081a337dce2ed4f66a1";
+ sha256 = "195qckaq6xiixh1m2h306c43mf09nfk5p840k2amdbg0i2wi44na";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -6071,12 +6083,12 @@ final: prev:
octo-nvim = buildVimPluginFrom2Nix {
pname = "octo.nvim";
- version = "2022-09-14";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "e634cd1b120af1d7f642081185782a24b49dc11f";
- sha256 = "1zlqyhxr8ibgahz3s3gwbw0ybkczgd96a18d5lfcg5i9axi6iaqp";
+ rev = "d91f88be51fa7cde8b5d6f529c057338aad18383";
+ sha256 = "0d4340gjbsvbdvymw0a7kpqwvzrn946nnsaav9i0z6rallrk583n";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
@@ -6131,12 +6143,12 @@ final: prev:
onedarkpro-nvim = buildVimPluginFrom2Nix {
pname = "onedarkpro.nvim";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "olimorris";
repo = "onedarkpro.nvim";
- rev = "18d2362f28ba577824e68e0a12d2338f67da0e06";
- sha256 = "1qan2g1a0kmbbzwd4hs9msv5bx47m0pa02jhl7ha03g0j2qbxbcx";
+ rev = "81f50f9ab0f4b556b4bd10c8c8cdf8a76ab01213";
+ sha256 = "179nq72hlcb4g5dgm8psl3il075km80ijz5kz5yzb43kllkaadls";
};
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
};
@@ -7227,12 +7239,12 @@ final: prev:
surround-nvim = buildVimPluginFrom2Nix {
pname = "surround.nvim";
- version = "2022-02-22";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ur4ltz";
repo = "surround.nvim";
- rev = "633068182cf894480341b992445f0f0d2883721d";
- sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i";
+ rev = "36c253d6470910692491b13382f54c9bab2811e1";
+ sha256 = "0bjv399gw0gkpfqclmv65viwi34il5zn5kx9zplnkq5r0734l3nw";
};
meta.homepage = "https://github.com/ur4ltz/surround.nvim/";
};
@@ -7481,12 +7493,12 @@ final: prev:
telescope-coc-nvim = buildVimPluginFrom2Nix {
pname = "telescope-coc.nvim";
- version = "2022-10-06";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "fannheyward";
repo = "telescope-coc.nvim";
- rev = "ecf56935b05c7da4150e6d046f07b920628aab53";
- sha256 = "16jl04zbsmhry1ybpcl9czs2lzlni6dzpaf163y9ff080cs5f3si";
+ rev = "da487dfd41266a0b5507a310da684ef3a3bfdb68";
+ sha256 = "1lnang3qn861z0p657aa8r7w6d1v6qn86gdwg7di11dgc5vljfh4";
};
meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/";
};
@@ -7602,12 +7614,12 @@ final: prev:
telescope-project-nvim = buildVimPluginFrom2Nix {
pname = "telescope-project.nvim";
- version = "2022-10-02";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-project.nvim";
- rev = "a0dec67decbc85cf1af2002807c8a963f72c1d13";
- sha256 = "0gz7rxzn7phq45ss1bhb5g35z1kq97r7yapvrnb1yi0259jwbxsa";
+ rev = "ff4d3cea905383a67d1a47b9dd210c4907d858c2";
+ sha256 = "16byj7gcyxpn837x096a074vpj67drbd5ndcfpkvp1xyam9604b4";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
};
@@ -7686,12 +7698,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
- version = "2022-10-08";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "5fadc247c56e739d9c5c30a484fd291bb87bd378";
- sha256 = "1bdzdsxx9l0aq2hk81diawpa56m7yh33wvb6kb0s4c7i2c6kbi3m";
+ rev = "f174a0367b4fc7cb17710d867e25ea792311c418";
+ sha256 = "1hra6vrr25xan0xwjc76m14ml6hwrm7nx2wapl44zx3m29hwfasx";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -7891,12 +7903,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
- version = "2022-10-05";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "fd9105c9487996aa2269992b72a6fea7504688e4";
- sha256 = "1aawphnlac7aaizn4im4v7lx87gnp1avishghvk3fglfsm95r3fz";
+ rev = "23c0038166800d373f3ec41e56768212aa3aaa2f";
+ sha256 = "1zz54cq4ls4kb74pjxpy1afzckw5m3q92r1gr83l36i7yn5w0h61";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@@ -9691,12 +9703,12 @@ final: prev:
vim-gist = buildVimPluginFrom2Nix {
pname = "vim-gist";
- version = "2021-11-04";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "mattn";
repo = "vim-gist";
- rev = "34e0f0aad5cc21cb3087a5d92ae1aa108019ecda";
- sha256 = "1dlsml47nh2mdllahh2nicnpqxk271p62cp3xsjd4dbbr0lallds";
+ rev = "5bfbb5450d9eff248f6c074de0b7800392439304";
+ sha256 = "00yvl59jbblkif4967kdg6b0mr0hd7rnr5mkxnb4n74akj9pwcf0";
};
meta.homepage = "https://github.com/mattn/vim-gist/";
};
@@ -10521,12 +10533,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2022-09-27";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "8fdaf4f78c94c6abba06a907520a5de157c5803b";
- sha256 = "0cm3vf84hvvi13v4239j3m24p6dzclv7y4061wyh6sdf7cdx6dqq";
+ rev = "23728ad8c5becd2641ac7fb7e995b36295d2544e";
+ sha256 = "026blks2bljynrw1xg8wmxz1ikr0f819ih0635bxwp8ah9dkfqzc";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -11410,12 +11422,12 @@ final: prev:
vim-qml = buildVimPluginFrom2Nix {
pname = "vim-qml";
- version = "2020-11-03";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "vim-qml";
- rev = "50d2e737094c146195171b7d52e522384f15afe8";
- sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr";
+ rev = "92cd291bc3d59126ef771dfaad5f2506636104c7";
+ sha256 = "1pabhpsikss4cr439yikwl7lnq5bahzs22xmv9icp3fz921c67bh";
};
meta.homepage = "https://github.com/peterhoeg/vim-qml/";
};
@@ -11830,12 +11842,12 @@ final: prev:
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2022-10-07";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "250fd916757a545e7dfa29a62afa1e7ea16e2460";
- sha256 = "1iimz25g4vyg9fnjsrbc1b6rkga99y9b3wn0qnyf9d1hms643k3a";
+ rev = "9a7f3968c92c6589d3a12aa5448e8374c8d68a42";
+ sha256 = "15bqw0l78s8v2l44j4h64lvs7456h5l0dy46kxas095jrjg9aqnw";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -11866,12 +11878,12 @@ final: prev:
vim-speeddating = buildVimPluginFrom2Nix {
pname = "vim-speeddating";
- version = "2021-04-29";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-speeddating";
- rev = "95da3d72efc91a5131acf388eafa4b1ad6512a9b";
- sha256 = "1al53c1x2bnnf0nnn7319jxq7bphaxdcnb5i7qa86m337jb2wqrp";
+ rev = "5a36fd29df63ea3f65562bd2bb837be48a5ec90b";
+ sha256 = "0zwhynknkcf9zpsl7ddsrihh351fy9k75ylfrzzl222i88g17d14";
};
meta.homepage = "https://github.com/tpope/vim-speeddating/";
};
@@ -12251,12 +12263,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2022-10-06";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "c345f17e8ff7c3158a60d7a4285fc29972fa0c80";
- sha256 = "1mi6x2k1dpyrw9fsrbq48rfyj4bsgcazy8jw7nnkhicmhp73mzqs";
+ rev = "58daf4b1927c4c4fa5377f7527a2d13d06a044f7";
+ sha256 = "1k91q2i7pv1yx1mdcwhagwvpi294zbwngvd63xv1wfkwkyi32jcj";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -12743,12 +12755,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2022-09-27";
+ version = "2022-10-09";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "c95ad4c8fb54adb75ceb0397ef6ace1c4eec3790";
- sha256 = "1mxgw6zx529lmi98z4072zc0ri9idf2ysaxmfby3wycl2z73b7k8";
+ rev = "90c8b7de334ee778c99eaafee41105808e363f81";
+ sha256 = "0hgasj2sr5kh4c70rwgzn2cfpw8vc61m82jjhis15a6bdl2jqw4a";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -13093,12 +13105,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
- version = "2022-10-08";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "e9b313b4dcaa35a8092c91fbff5984df39406173";
- sha256 = "08g2qlqjrg0svj53h91ay95fraa15v8myvx3yjvggi1f6y4vgwcf";
+ rev = "9991ede2bc5714abfdca7eaf5b20be429502ffe4";
+ sha256 = "10w5q3v91swm538rczncvpzmph01rvpzvwv3zi5la6hbkz5qab8y";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -13117,12 +13129,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
- version = "2022-10-09";
+ version = "2022-10-10";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "06d13155ac420b410b2b48e36d62069035c00323";
- sha256 = "0mn54z0w6sjxh3fb0igkmcbms102mi52js3fj3kjx5b56iy1k87r";
+ rev = "caab879af5f52cdfc673ebd2aff2fb099cf538e1";
+ sha256 = "0rb89dlil2lv8cf7x2vsqfvh0ba7mr5rfwyzx8ln7h8bj56hnx5i";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 33223084447f..e7f9251e9b2d 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -296,6 +296,7 @@ https://github.com/edluffy/hologram.nvim/,,
https://github.com/urbit/hoon.vim/,,
https://github.com/phaazon/hop.nvim/,,
https://github.com/rktjmp/hotpot.nvim/,,
+https://github.com/anuvyklack/hydra.nvim/,HEAD,
https://github.com/mboughaba/i3config.vim/,,
https://github.com/cocopon/iceberg.vim/,,
https://github.com/idris-hackers/idris-vim/,,
diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix
index 3f8c2fc97b0e..c53276659e08 100644
--- a/pkgs/applications/emulators/rpcs3/default.nix
+++ b/pkgs/applications/emulators/rpcs3/default.nix
@@ -9,10 +9,10 @@
let
# Keep these separate so the update script can regex them
- rpcs3GitVersion = "14141-d686b48f6";
- rpcs3Version = "0.0.24-14141-d686b48f6";
- rpcs3Revision = "d686b48f6549c736661e14d1e0990b043c32e3c2";
- rpcs3Sha256 = "1jzpb189isy9kc6l5cy1nfx0wq5cri753sh32b1xq259lkqihdp5";
+ rpcs3GitVersion = "14241-92b08a4fa";
+ rpcs3Version = "0.0.24-14241-92b08a4fa";
+ rpcs3Revision = "92b08a4fafb1e36ccc23ac7e2a9b10e91a9b6df7";
+ rpcs3Sha256 = "01h9m4cdywdfhiv5kjd7cv53spv3g2ixk3dvji14vi28zac8jcxb";
ittapi = fetchFromGitHub {
owner = "intel";
diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix
index 49cf0ff1b605..461a07837d83 100644
--- a/pkgs/applications/graphics/image-roll/default.nix
+++ b/pkgs/applications/graphics/image-roll/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, glib
, pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
, gtk4
}:
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
- nativeBuildInputs = [ glib pkg-config wrapGAppsHook ];
+ nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ];
buildInputs = [ gtk4 ];
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
"--skip=file_list::tests"
# sometimes fails on darwin
- "image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none"
+ "--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none"
];
postInstall = ''
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 186826e6f7d4..918605366fe7 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -1,12 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK, Cocoa }:
-let
- wxInputs =
- if stdenv.isDarwin then
- [ wxmac darwin.apple_sdk.frameworks.Cocoa ]
- else
- [ wxGTK ];
-in
stdenv.mkDerivation rec {
pname = "diff-pdf";
version = "0.5";
@@ -19,7 +12,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoconf automake pkg-config ];
- buildInputs = [ cairo poppler ] ++ wxInputs;
+ buildInputs = [ cairo poppler wxGTK ]
+ ++ lib.optionals stdenv.isDarwin [ Cocoa ];
preConfigure = "./bootstrap";
diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix
index bd27a60e7443..f14084a865e5 100644
--- a/pkgs/applications/misc/mangal/default.nix
+++ b/pkgs/applications/misc/mangal/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "mangal";
- version = "3.11.0";
+ version = "3.12.0";
src = fetchFromGitHub {
owner = "metafates";
repo = pname;
rev = "v${version}";
- hash = "sha256-gBHNB3s7RHHxlxgeUFmxOdYvPaI78AzL4vRaCmXKgus=";
+ hash = "sha256-1fWy7riInrbReQ0sQ1TF8GhqWQG0KXk1JzhmxlSuvmk=";
};
proxyVendor = true;
- vendorSha256 = "sha256-dHwookjeF8U/2i0Totho0HY7FdOr/jABmqlQelthc6E=";
+ vendorSha256 = "sha256-+HDuGSZinotUtCqffrmFkjHegxdArSJMWwnUG/tnLRc=";
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix
index 77f1c3f9aef5..49b38bec655a 100644
--- a/pkgs/applications/misc/tandoor-recipes/common.nix
+++ b/pkgs/applications/misc/tandoor-recipes/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "1.4.1";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "TandoorRecipes";
repo = "recipes";
rev = version;
- sha256 = "sha256-Q/IwjSByCUXVYxhk3U7oWvlMxrJxyajhpsRyq67PVHY=";
+ sha256 = "sha256-1wqZoOT2Aafbs2P0mL33jw5HkrLIitUcRt6bQQcHx40=";
};
yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk=";
diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix
index 008468f1b5e5..767d0c768ded 100644
--- a/pkgs/applications/misc/tandoor-recipes/default.nix
+++ b/pkgs/applications/misc/tandoor-recipes/default.nix
@@ -112,6 +112,9 @@ python.pkgs.pythonPackages.buildPythonPackage rec {
makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \
--prefix PYTHONPATH : "$PYTHONPATH"
+ # usually copied during frontend build (see vue.config.js)
+ cp vue/src/sw.js $out/lib/tandoor-recipes/cookbook/templates/
+
runHook postInstall
'';
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 76815b45dbab..cfcab22c8728 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -75,13 +75,13 @@
"version": "2.2.0"
},
"auth0": {
- "hash": "sha256-0y7sS03/cvO49jo4IY+xyh3dYZYcHOTlbCV1JBiYZQ4=",
+ "hash": "sha256-xe9BWrkuQqmwjUy3ys7M3IWJjqZiWkox9NYmsH3VHJ8=",
"owner": "auth0",
"provider-source-address": "registry.terraform.io/auth0/auth0",
"repo": "terraform-provider-auth0",
- "rev": "v0.37.1",
- "vendorHash": "sha256-8mGbTkAf42YQ5kKQmC0qSS8lj6Bd/KzpyX3MtS9r6Fk=",
- "version": "0.37.1"
+ "rev": "v0.38.0",
+ "vendorHash": "sha256-e5mQ3NrWdFeyIjh38YbTd9fRVuxJB6FPmw7xNlEHzGY=",
+ "version": "0.38.0"
},
"avi": {
"hash": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=",
@@ -304,13 +304,13 @@
"version": "0.0.3"
},
"digitalocean": {
- "hash": "sha256-FnVmkHNMuWF01eSOCMyPQescyao/cyUjXwimwYU5gqY=",
+ "hash": "sha256-iLwAkmzKRY8NfUHVGcstIHlSnZY+oi7fhCNP2kCzIxM=",
"owner": "digitalocean",
"provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
"repo": "terraform-provider-digitalocean",
- "rev": "v2.22.3",
+ "rev": "v2.23.0",
"vendorHash": null,
- "version": "2.22.3"
+ "version": "2.23.0"
},
"dme": {
"hash": "sha256-QNkr+6lKlKY+os0Pf6dqlmIn9u2LtMOo6ONahDeA9mE=",
@@ -441,24 +441,24 @@
"version": "3.18.0"
},
"google": {
- "hash": "sha256-b2U4bViukaGXcbkhSpE57dH0w45jUL5TSF2/pdmqqQY=",
+ "hash": "sha256-tjcG23chJwuaf/SRD6Kqz49fdWFKMaVygg/FGydaSR8=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
- "rev": "v4.39.0",
+ "rev": "v4.40.0",
"vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=",
- "version": "4.39.0"
+ "version": "4.40.0"
},
"google-beta": {
- "hash": "sha256-iYNolS1tvlsa0C/UX4xbtOVhGz8wkpit8z2sPSk22a0=",
+ "hash": "sha256-U27ZzjNMFP/TCpXrU0QQ0uYB0sgeWVmRrQFIzq7FAhs=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
- "rev": "v4.39.0",
+ "rev": "v4.40.0",
"vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=",
- "version": "4.39.0"
+ "version": "4.40.0"
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@@ -615,13 +615,13 @@
"version": "0.3.0"
},
"keycloak": {
- "hash": "sha256-JDMPr2uFi+9CcHdyigmP1DM3uRx2+eFnzSaHp+es2Tg=",
+ "hash": "sha256-5IMSUSaSoe+zqwtcL6aQ7PTtLpNiWxYp/J38Zm+Hniw=",
"owner": "mrparkers",
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
"repo": "terraform-provider-keycloak",
- "rev": "v3.10.0",
- "vendorHash": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=",
- "version": "3.10.0"
+ "rev": "v4.0.0",
+ "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=",
+ "version": "4.0.0"
},
"ksyun": {
"hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=",
@@ -1175,22 +1175,22 @@
"version": "1.9.1"
},
"ucloud": {
- "hash": "sha256-lx3LLBmqUjRc+Jn+SbLk6DChJJ2jbuh720wnO05qot0=",
+ "hash": "sha256-+qbDbss4HSy0hCWiqMBgshvP8WZujJGzy6omXIkypNo=",
"owner": "ucloud",
"provider-source-address": "registry.terraform.io/ucloud/ucloud",
"repo": "terraform-provider-ucloud",
- "rev": "v1.32.2",
+ "rev": "v1.32.3",
"vendorHash": null,
- "version": "1.32.2"
+ "version": "1.32.3"
},
"utils": {
"hash": "sha256-Mh1yj1VZ620xSs1a5j86K4uCUyjzdeCphKLANQvgTNA=",
"owner": "cloudposse",
"provider-source-address": "registry.terraform.io/cloudposse/utils",
"repo": "terraform-provider-utils",
- "rev": "1.3.0",
+ "rev": "1.4.1",
"vendorHash": "sha256-00kcosPSk/Ll7UQhnrEGRo0USvFM2V5MLKnndfhQEQA=",
- "version": "1.3.0"
+ "version": "1.4.1"
},
"vault": {
"hash": "sha256-v+WhEJ9HsTdOqSVpbV/qVCEICsgY3nEqcIutYHi3aQ8=",
diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix
index 8452d3c26f65..2d23ece5e45c 100644
--- a/pkgs/applications/networking/onionshare/default.nix
+++ b/pkgs/applications/networking/onionshare/default.nix
@@ -26,12 +26,12 @@
}:
let
- version = "2.5";
+ version = "2.6";
src = fetchFromGitHub {
owner = "onionshare";
repo = "onionshare";
rev = "v${version}";
- sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo=";
+ sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4=";
};
meta = with lib; {
description = "Securely and anonymously send and receive files";
diff --git a/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/pkgs/applications/networking/onionshare/fix-paths-gui.patch
index 4eb611c860db..63bc3f68d3b1 100644
--- a/pkgs/applications/networking/onionshare/fix-paths-gui.patch
+++ b/pkgs/applications/networking/onionshare/fix-paths-gui.patch
@@ -1,6 +1,6 @@
--- a/onionshare/gui_common.py
+++ b/onionshare/gui_common.py
-@@ -410,52 +410,12 @@ class GuiCommon:
+@@ -482,52 +482,12 @@ class GuiCommon:
}
def get_tor_paths(self):
@@ -29,12 +29,12 @@
-
- if self.common.platform == "Windows":
- base_path = self.get_resource_path("tor")
-- tor_path = os.path.join(base_path, "Tor", "tor.exe")
-- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
-- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
-- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
-- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
-- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
+- tor_path = os.path.join(base_path, "tor.exe")
+- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
+- meek_client_file_path = os.path.join(base_path, "meek-client.exe")
+- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
+- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
- elif self.common.platform == "Darwin":
- base_path = self.get_resource_path("tor")
- tor_path = os.path.join(base_path, "tor")
diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch
index fec4b4e0395b..62e69f927b56 100644
--- a/pkgs/applications/networking/onionshare/fix-paths.patch
+++ b/pkgs/applications/networking/onionshare/fix-paths.patch
@@ -1,6 +1,6 @@
--- a/onionshare_cli/common.py
+++ b/onionshare_cli/common.py
-@@ -318,67 +318,12 @@ class Common:
+@@ -318,73 +318,12 @@ class Common:
return path
def get_tor_paths(self):
@@ -18,21 +18,27 @@
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
- base_path = self.get_resource_path("tor")
- base_path = base_path.replace("onionshare_cli", "onionshare")
-- tor_path = os.path.join(base_path, "Tor", "tor.exe")
+- tor_path = os.path.join(base_path, "tor.exe")
-
- # If tor.exe isn't there, mayber we're running from the source tree
- if not os.path.exists(tor_path):
+- self.log(
+- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
+- )
- base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
-
-- tor_path = os.path.join(base_path, "Tor", "tor.exe")
+- tor_path = os.path.join(base_path, "tor.exe")
- if not os.path.exists(tor_path):
+- self.log(
+- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
+- )
- raise CannotFindTor()
-
-- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
-- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
-- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
-- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
-- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
+- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
+- meek_client_file_path = os.path.join(base_path, "meek-client.exe")
+- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
+- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
-
- elif self.platform == "Darwin":
- # Let's see if we have tor binaries in the onionshare GUI package
diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix
index 4f61be6669aa..8a54d4eb77bf 100644
--- a/pkgs/applications/version-management/p4/default.nix
+++ b/pkgs/applications/version-management/p4/default.nix
@@ -1,31 +1,115 @@
-{ stdenv, fetchurl, lib, autoPatchelfHook }:
+{ stdenv
+, fetchurl
+, fetchzip
+, lib
+, emptyDirectory
+, linkFarm
+, symlinkJoin
+, jam
+, libcxx
+, libcxxabi
+, openssl
+, xcbuild
+, CoreServices
+, Foundation
+, Security
+}:
+let
+ opensslStatic = openssl.override {
+ static = true;
+ };
+ androidZlibContrib =
+ let
+ src = fetchzip {
+ url = "https://android.googlesource.com/platform/external/zlib/+archive/61174f4fd262c6075f88768465f308aae95a2f04.tar.gz";
+ sha256 = "sha256-EMzKAHcEWOUugcHKH2Fj3ZaIHC9UlgO4ULKe3RvgxvI=";
+ stripRoot = false;
+ };
+ in
+ linkFarm "android-zlib-contrib" [
+ # We only want to keep the contrib directory as the other files conflict
+ # with p4's own zlib files. (For the same reason, we can't use the
+ # cone-based Git sparse checkout, either.)
+ { name = "contrib"; path = "${src}/contrib"; }
+ ];
+ libcxxUnified = symlinkJoin {
+ inherit (libcxx) name;
+ paths = [ libcxx libcxxabi ];
+ };
+in
stdenv.mkDerivation rec {
pname = "p4";
- version = "2021.2.2201121";
+ version = "2022.1.2305383";
src = fetchurl {
- # actually https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz but upstream deletes releases
- url = "https://web.archive.org/web/20211118024943/https://cdist2.perforce.com/perforce/r21.2/bin.linux26x86_64/helix-core-server.tgz";
- sha256 = "sha256-SrfI2ZD7KDyttCd8+fo8g4UZKljYYO/SbzqrS9tAcC8=";
+ # Upstream replaces minor versions, so use archived URL.
+ url = "https://web.archive.org/web/20220901184735id_/https://ftp.perforce.com/perforce/r22.1/bin.tools/p4source.tgz";
+ sha256 = "27ab3ddd7b178b05cf0b710e941650dac0688d294110ebafda9027732c0944c6";
};
- sourceRoot = ".";
+ nativeBuildInputs = [ jam ];
- dontBuild = true;
+ buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ];
- nativeBuildInputs = [ autoPatchelfHook ];
+ outputs = [ "out" "bin" "dev" ];
- installPhase = ''
- install -D --target $out/bin p4 p4broker p4d p4p
+ hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ];
+
+ jamFlags =
+ [
+ "-sEXEC=bin.unix"
+ "-sCROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ "-sMALLOC_OVERRIDE=no"
+ "-sSSLINCDIR=${lib.getDev opensslStatic}/include"
+ "-sSSLLIBDIR=${lib.getLib opensslStatic}/lib"
+ ]
+ ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ]
+ ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ]
+ ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ]
+ ++ lib.optionals stdenv.isDarwin [
+ "-sOSVER=1013"
+ "-sMACOSX_SDK=${emptyDirectory}"
+ "-sLIBC++DIR=${libcxxUnified}/lib"
+ ];
+
+ CCFLAGS =
+ # The file contrib/optimizations/slide_hash_neon.h is missing from the
+ # upstream distribution. It comes from the Android/Chromium sources.
+ lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ];
+
+ "C++FLAGS" =
+ # Avoid a compilation error that only occurs for 4-byte longs.
+ lib.optionals stdenv.isi686 [ "-Wno-narrowing" ]
+ # See the "Header dependency changes" section of
+ # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more
+ # information on why we need to include these.
+ ++ lib.optionals
+ (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0"))
+ [ "-include" "limits" "-include" "thread" ];
+
+ buildPhase = ''
+ runHook preBuild
+ jam $jamFlags -j$NIX_BUILD_CORES p4
+ jam $jamFlags -j$NIX_BUILD_CORES -sPRODUCTION=yes p4api.tar
+ runHook postBuild
'';
- meta = {
- description = "Perforce Command-Line Client";
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $bin/bin $dev $out
+ cp bin.unix/p4 $bin/bin
+ cp -r bin.unix/p4api-${version}/include $dev
+ cp -r bin.unix/p4api-${version}/lib $out
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Perforce Helix Core command-line client and APIs";
homepage = "https://www.perforce.com";
- sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
- license = lib.licenses.unfree;
- platforms = [ "x86_64-linux" ];
- maintainers = with lib.maintainers; [ corngood ];
+ license = licenses.bsd2;
+ mainProgram = "p4";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ corngood impl ];
};
}
diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix
index 5b98131303d3..e2cf8e1013c3 100644
--- a/pkgs/applications/version-management/p4d/default.nix
+++ b/pkgs/applications/version-management/p4d/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
license = licenses.unfree;
mainProgram = "p4d";
platforms = builtins.attrNames srcs;
- maintainers = with maintainers; [ impl ];
+ maintainers = with maintainers; [ corngood impl ];
};
}
diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix
index 219010eeb393..d50b7ababfa7 100644
--- a/pkgs/applications/video/showmethekey/default.nix
+++ b/pkgs/applications/video/showmethekey/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, glib
, meson
, ninja
@@ -10,10 +11,11 @@
, pango
, libinput
, gtk4
-, wrapGAppsHook
+, wrapGAppsHook4
, libxkbcommon
, pkg-config
}:
+
stdenv.mkDerivation rec {
pname = "showmethekey";
version = "1.7.3";
@@ -25,6 +27,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA=";
};
+ patches = [
+ (fetchpatch {
+ name = "use-gtk4-update-icon-cache.patch";
+ url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch";
+ sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo=";
+ })
+ ];
+
nativeBuildInputs = [
glib
meson
@@ -36,7 +46,7 @@ stdenv.mkDerivation rec {
libevdev
libinput
libxkbcommon
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix
index 10af8fe502ca..cb4cea09ec2c 100644
--- a/pkgs/applications/virtualization/pods/default.nix
+++ b/pkgs/applications/virtualization/pods/default.nix
@@ -8,7 +8,7 @@
, ninja
, pkg-config
, rustPlatform
-, wrapGAppsHook
+, wrapGAppsHook4
, gtksourceview5
, libadwaita
}:
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
rustPlatform.rust.cargo
rustPlatform.rust.rustc
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 02188335129a..676ef78e3b34 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -11,7 +11,11 @@ let
sources = {
"${dartVersion}-x86_64-linux" = fetchurl {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
- sha256 = dartHash;
+ sha256 = dartHash.x86_64-linux;
+ };
+ "${dartVersion}-aarch64-linux" = fetchurl {
+ url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
+ sha256 = dartHash.aarch64-linux;
};
};
};
@@ -28,7 +32,10 @@ in
version = "3.3.3";
dartVersion = "2.18.2";
hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg=";
- dartHash = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
+ dartHash = {
+ x86_64-linux = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU";
+ aarch64-linux = "sha256-zyIK1i5/9P2C+sjzdArhFwpVO4P+It+/X50l+n9gekI=";
+ };
patches = getPatches ./patches/flutter3;
};
@@ -37,7 +44,10 @@ in
version = "2.10.5";
dartVersion = "2.16.2";
hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0=";
- dartHash = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
+ dartHash = {
+ x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
+ aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY=";
+ };
patches = getPatches ./patches/flutter2;
};
}
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index f2c861356ab6..c9b8a2113491 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -174,7 +174,7 @@ runCommand drvName
'';
homepage = "https://flutter.dev";
license = licenses.bsd3;
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
maintainers = with maintainers; [ babariviere ericdallo ];
};
} ''
diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix
index dea603b5e4f5..8ffa99d29b4b 100644
--- a/pkgs/development/coq-modules/VST/default.nix
+++ b/pkgs/development/coq-modules/VST/default.nix
@@ -25,7 +25,7 @@ mkCoqDerivation {
repo = "VST";
inherit version;
defaultVersion = with versions; switch coq.coq-version [
- { case = range "8.14" "8.15"; out = "2.10"; }
+ { case = range "8.14" "8.16"; out = "2.10"; }
{ case = range "8.13" "8.15"; out = "2.9"; }
{ case = range "8.12" "8.13"; out = "2.8"; }
] null;
@@ -39,7 +39,7 @@ mkCoqDerivation {
preConfigure = ''
patchShebangs util
substituteInPlace Makefile \
- --replace 'COQVERSION= ' 'COQVERSION= 8.15.2 or-else 8.15.1 or-else '\
+ --replace 'COQVERSION= ' 'COQVERSION= 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\
--replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}'
'';
diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix
index 596c059f5018..c8c66395c428 100644
--- a/pkgs/development/coq-modules/compcert/default.nix
+++ b/pkgs/development/coq-modules/compcert/default.nix
@@ -16,7 +16,7 @@ let compcert = mkCoqDerivation rec {
releaseRev = v: "v${v}";
defaultVersion = with versions; switch coq.version [
- { case = range "8.14" "8.15"; out = "3.11"; }
+ { case = range "8.14" "8.16"; out = "3.11"; }
{ case = isEq "8.13" ; out = "3.10"; }
{ case = isEq "8.12" ; out = "3.9"; }
{ case = range "8.8" "8.11"; out = "3.8"; }
@@ -138,6 +138,15 @@ compcert.overrideAttrs (o:
})
];
}
+ { cases = [ (isEq "8.16") "3.11" ];
+ out = [
+ # Support for Coq 8.16.0
+ (fetchpatch {
+ url = "https://github.com/AbsInt/CompCert/commit/34be08a23d18d56f2dde24fd24b6dbe3bcb01ec3.patch";
+ sha256 = "sha256-a5YnftGVadVypEqrOYRRxI7YtGOEWyKnO4GqakFhvzI=";
+ })
+ ];
+ }
] [];
}
)
diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix
index 0426a72c81aa..f45dda4088fa 100644
--- a/pkgs/development/interpreters/bqn/cbqn/default.nix
+++ b/pkgs/development/interpreters/bqn/cbqn/default.nix
@@ -4,6 +4,7 @@
, genBytecode ? false
, bqn-path ? null
, mbqn-source ? null
+, libffi
}:
let
@@ -11,23 +12,27 @@ let
name = "cbqn-bytecode-files";
owner = "dzaima";
repo = "CBQN";
- rev = "c39653c898531a2cdbf4cc5c764df6e37b1894a4";
- hash = "sha256-JCEmkwh5Rv5+NQoxvefSrYnayU892/Wam+gjMgcQmO0=";
+ rev = "3df8ae563a626ff7ae0683643092f0c3bc2481e5";
+ hash = "sha256:0rh9qp1bdm9aa77l0kn9n4jdy08gl6l7898lncskxiq9id6xvyb8";
};
in
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
- version = "0.pre+date=2022-05-06";
+ version = "0.pre+date=2022-10-04";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
- rev = "3496a939b670f8c9ca2a04927378d6b7e9abd68e";
- hash = "sha256-P+PoY4XF9oEw7VIpmybvPp+jxWHEo2zt1Lamayf1mHg=";
+ rev = "abcb575a537712763e9e53b6cb0eb415346b00e6";
+ hash = "sha256:05gqw2ppcykv36ji8mkp8mq502q84vk9algp9c2d3z495xqy8rn6";
};
+ buildInputs = [
+ libffi
+ ];
+
dontConfigure = true;
postPatch = ''
@@ -44,8 +49,13 @@ stdenv.mkDerivation rec {
'' + (if genBytecode then ''
${bqn-path} genRuntime ${mbqn-source}
'' else ''
- cp ${cbqn-bytecode-files}/src/gen/{compiles,formatter,runtime0,runtime1,src} src/gen/
- '');
+ cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} src/gen/
+ '')
+ # Need to adjust ld flags for darwin manually
+ # https://github.com/dzaima/CBQN/issues/26
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ makeFlagsArray+=(LD_LIBS="-ldl -lffi")
+ '';
installPhase = ''
runHook preInstall
diff --git a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
index fbb5b458d08b..83d4a08e33dc 100644
--- a/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
+++ b/pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bqn";
- version = "0.pre+date=2021-12-13";
+ version = "0.pre+date=2022-10-03";
src = fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
- rev = "2c2e86e10ff963a6aefa14f76fd8833ce3c9157c";
- hash = "sha256-iAlDXGlHTeI6+r/QKFiBHhj5A+FgUy7JFrCpAwpyVQU=";
+ rev = "1518205cceeb1fef27c584d24e92b189ffd234f4";
+ hash = "sha256:1pyk331ymbs2fv9jxmbv28yvk9mr2mcni1dsja6fzkk1jrd767hy";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix
index 81a0662b4371..3b1c9ff22e8f 100644
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@@ -8,25 +8,23 @@
, setfile
, rez
, derez
-, wxmac
}:
stdenv.mkDerivation rec {
pname = "wxsqlite3";
- version = "4.8.2";
+ version = "4.9.0";
src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
- hash = "sha256-YoeCUyWVxpXY1QCTNONpv2QjV3rLZY84P6D3pXiWXo0=";
+ hash = "sha256-9WnXaMpKzqJhdfT7ScOhULbOwJsmuiS0IpYDArWq82s=";
};
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ sqlite ]
- ++ lib.optionals (!stdenv.isDarwin) [ wxGTK ]
- ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez wxmac ];
+ buildInputs = [ sqlite wxGTK ]
+ ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez ];
meta = with lib; {
homepage = "https://utelle.github.io/wxsqlite3/";
diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix
index c8f312b21d6b..3cf08ad6ab89 100644
--- a/pkgs/development/python-modules/aiounifi/default.nix
+++ b/pkgs/development/python-modules/aiounifi/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiounifi";
- version = "38";
+ version = "39";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-NKraMxpP9O22NzO4UDl6zYBeJldTRdf4U43WVQYcPyQ=";
+ hash = "sha256-FZ8Pu0PHSBC7azzVoSN+UM4UsVG/HRSS01Ys+DTfxRU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index f05458329921..46522ea9d6a9 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "ansible-lint";
- version = "6.8.0";
+ version = "6.8.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-gE3HFUNs3mp09E6AhEXC8R1+/QFlQbJ7tuxYz9sbH20=";
+ sha256 = "sha256-E/ci0+AyOwzjoQc1jA4eIWnbWpO2j/zyDhAwu6Fv1w0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
index b24fb270b78c..c11e09790eb7 100644
--- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
+++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bluetooth-auto-recovery";
- version = "0.3.3";
+ version = "0.3.4";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
- hash = "sha256-vzSpQ43vy0a+8PWdTz/RjdXGxwmebdBX/qXhF6Mnw4Y=";
+ hash = "sha256-jInCWya146QI7D89zSAPChF8GMDj7NRzu9NvVIbkntM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix
index 54df7457a35c..a46a05ba9c23 100644
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, cryptography
-, types-cryptography
, pytestCheckHook
, pythonOlder
, sphinxHook
diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix
index afe961f7323b..3731ea988f61 100644
--- a/pkgs/development/python-modules/wxPython/4.1.nix
+++ b/pkgs/development/python-modules/wxPython/4.1.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchPypi
+, fetchpatch
, buildPythonPackage
, setuptools
, which
@@ -12,6 +13,19 @@
, ncurses
, pango
, wxGTK
+, AGL
+, AudioToolbox
+, AVFoundation
+, AVKit
+, Carbon
+, Cocoa
+, CoreFoundation
+, CoreMedia
+, IOKit
+, Kernel
+, OpenGL
+, Security
+, WebKit
, pillow
, numpy
, libXinerama
@@ -41,6 +55,13 @@ buildPythonPackage rec {
sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80";
};
+ # ld: framework not found System
+ postPatch = ''
+ for file in ext/wxWidgets/configure*; do
+ substituteInPlace $file --replace "-framework System" ""
+ done
+ '';
+
# https://github.com/NixOS/nixpkgs/issues/75759
# https://github.com/wxWidgets/Phoenix/issues/1316
doCheck = false;
@@ -71,6 +92,20 @@ buildPythonPackage rec {
libglvnd
mesa
webkitgtk
+ ] ++ lib.optionals stdenv.isDarwin [
+ AGL
+ AudioToolbox
+ AVFoundation
+ AVKit
+ Carbon
+ Cocoa
+ CoreFoundation
+ CoreMedia
+ IOKit
+ Kernel
+ OpenGL
+ Security
+ WebKit
];
propagatedBuildInputs = [ pillow numpy ];
@@ -97,7 +132,6 @@ buildPythonPackage rec {
'';
meta = with lib; {
- broken = stdenv.isDarwin;
description = "Cross platform GUI toolkit for Python, Phoenix version";
homepage = "http://wxpython.org/";
license = licenses.wxWindows;
diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index d484ac30a28d..30bfe8ad4167 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "zigpy-xbee";
- version = "0.16.1";
+ version = "0.16.2";
# https://github.com/Martiusweb/asynctest/issues/152
# broken by upstream python bug with asynctest and
# is used exclusively by home-assistant with python 3.8
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy-xbee";
rev = "refs/tags/${version}";
- sha256 = "sha256-75LftepCexIsqVMgrJKeTJWHlPI5zcj2aZbJt09JSwE=";
+ sha256 = "sha256-EzdKY/VisMUc/5yHN+7JUz1fDM4mCpk5TyApC24z4CU=";
};
buildInputs = [
diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index c79efdf738ca..694871fbf78a 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "zigpy-zigate";
- version = "0.10.1";
+ version = "0.10.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy-zigate";
rev = "refs/tags/v${version}";
- hash = "sha256-g6EFc9z9LrUawDczgGaIt5o+Vgp5U3swJJD8VftL4bQ=";
+ hash = "sha256-Vb87G+R4SvAhCF3h/U5Q4/avxPgfIjklWdWGaiIWGhk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix
index 934881b6781c..ce948edd5aa3 100644
--- a/pkgs/development/tools/leaps/default.nix
+++ b/pkgs/development/tools/leaps/default.nix
@@ -1,24 +1,27 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, testers, leaps }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "leaps";
- version = "0.9.0";
-
- goPackagePath = "github.com/Jeffail/leaps";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "Jeffail";
repo = "leaps";
- sha256 = "1bzas7ixyfsfh81lnvplhx59yghkmnmy5p7jv9rnwp219dwbylpz";
rev = "v${version}";
+ sha256 = "sha256-9AYE8+K6B6/odwNR+UhTTqmJ1RD6HhKvtC3WibWUZic=";
};
- goDeps = ./deps.nix;
+ proxyVendor = true; # darwin/linux hash mismatch
+ vendorSha256 = "sha256-0dwUOoV2bxPB+B6CKxJPImPIDlBMPcm0AwEMrVUkALc=";
- meta = {
+ ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+
+ passthru.tests.version = testers.testVersion { package = leaps; };
+
+ meta = with lib; {
description = "A pair programming tool and library written in Golang";
homepage = "https://github.com/jeffail/leaps/";
- license = "MIT";
+ license = licenses.mit;
maintainers = with lib.maintainers; [ qknight ];
platforms = lib.platforms.unix;
};
diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix
deleted file mode 100644
index ee06659c72ec..000000000000
--- a/pkgs/development/tools/leaps/deps.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/Azure/go-autorest";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722";
- sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r";
- };
- }
- {
- goPackagePath = "github.com/Jeffail/gabs";
- fetch = {
- type = "git";
- url = "https://github.com/Jeffail/gabs";
- rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c";
- sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr";
- };
- }
- {
- goPackagePath = "github.com/amir/raidman";
- fetch = {
- type = "git";
- url = "https://github.com/amir/raidman";
- rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b";
- sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr";
- };
- }
- {
- goPackagePath = "github.com/azure/azure-sdk-for-go";
- fetch = {
- type = "git";
- url = "https://github.com/azure/azure-sdk-for-go";
- rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f";
- sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq";
- };
- }
- {
- goPackagePath = "github.com/cenkalti/backoff";
- fetch = {
- type = "git";
- url = "https://github.com/cenkalti/backoff";
- rev = "61153c768f31ee5f130071d08fc82b85208528de";
- sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29";
- sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs";
- };
- }
- {
- goPackagePath = "github.com/elazarl/go-bindata-assetfs";
- fetch = {
- type = "git";
- url = "https://github.com/elazarl/go-bindata-assetfs";
- rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43";
- sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp";
- };
- }
- {
- goPackagePath = "github.com/garyburd/redigo";
- fetch = {
- type = "git";
- url = "https://github.com/garyburd/redigo";
- rev = "d1ed5c67e5794de818ea85e6b522fda02623a484";
- sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24";
- };
- }
- {
- goPackagePath = "github.com/go-sql-driver/mysql";
- fetch = {
- type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "a0583e0143b1624142adab07e0e97fe106d99561";
- sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "925541529c1fa6821df4e44ce2723319eb2be768";
- sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
- sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
- };
- }
- {
- goPackagePath = "github.com/kardianos/osext";
- fetch = {
- type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
- sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
- };
- }
- {
- goPackagePath = "github.com/lib/pq";
- fetch = {
- type = "git";
- url = "https://github.com/lib/pq";
- rev = "88edab0803230a3898347e77b474f8c1820a1f20";
- sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p";
- };
- }
- {
- goPackagePath = "github.com/marstr/guid";
- fetch = {
- type = "git";
- url = "https://github.com/marstr/guid";
- rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca";
- sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x";
- };
- }
- {
- goPackagePath = "github.com/satori/go.uuid";
- fetch = {
- type = "git";
- url = "https://github.com/satori/go.uuid";
- rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3";
- sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb";
- sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf";
- };
- }
- {
- goPackagePath = "gopkg.in/alexcesaro/statsd.v2";
- fetch = {
- type = "git";
- url = "https://github.com/alexcesaro/statsd";
- rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90";
- sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
- sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
- };
- }
-]
diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index a5718c174580..5b275f82346b 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
- version = "0.11.8";
+ version = "0.11.9";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "sha256-j7je+ZBTIkRfOPpUWbwz4JR06KprMn8sZXONrtI/n8s=";
+ outputHash = "sha256-CJ34OZOAM0Le9U0KSe0nKINnxA3iUgqUMtS06YnjvVo=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/development/tools/misc/gf/default.nix
index d47a4ae2c241..53746bb37780 100644
--- a/pkgs/development/tools/misc/gf/default.nix
+++ b/pkgs/development/tools/misc/gf/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "gf";
- version = "unstable-2022-08-01";
+ version = "unstable-2022-09-26";
src = fetchFromGitHub {
repo = "gf";
owner = "nakst";
- rev = "c0a018a9b965eb97551ee87d5236a9f57011cea2";
- hash = "sha256-i0aLSy+4/fbYZpUKExFDUZ/2nXJmEhRsAX0JQZ8EhNk=";
+ rev = "404fc6d66c60bb01e9bcbb69021e66c543bda2d5";
+ hash = "sha256-HRejpEN/29Q+wukU3Jv3vZoK6/VjZK6VnZdvPuFBC9I=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
index dbf91927edda..09d2c55c97de 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/indoorvivants/tree-sitter-smithy",
- "rev": "1cdb3578dfec76f19e566ea4c1e305632e88026a",
- "date": "2022-05-21T16:39:36+01:00",
- "path": "/nix/store/smvp9nkdg6amfzspfj0inmfvcsjgrsjz-tree-sitter-smithy",
- "sha256": "14xaflvz43m1c892jh0bg2yzsj1mrambkvsj6xkx84j141nnf4vm",
+ "rev": "084537ae85d186448c447de959a4955c0b855d2b",
+ "date": "2022-10-09T13:04:45+01:00",
+ "path": "/nix/store/4r9gfwad9f769y0ivivprlpqjbq8di8s-tree-sitter-smithy",
+ "sha256": "17l94ay7vv2b1iihnzssbw3i027yvk5a44waqlyzgf2bkqk7iqs0",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix
index 9541e7f78e3f..424cafde2f6a 100644
--- a/pkgs/development/tools/unconvert/default.nix
+++ b/pkgs/development/tools/unconvert/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "unconvert";
- version = "unstable-2020-02-28";
+ version = "unstable-2022-09-18";
src = fetchFromGitHub {
owner = "mdempsky";
repo = "unconvert";
- rev = "95ecdbfc0b5f3e65790c43c77874ee5357ad8a8f";
- sha256 = "sha256-jC2hbpGJeW9TBWIWdeLeGaoNdsm/gOKY4oaDsO5Fwlw=";
+ rev = "3f84926d692329767c21c2aef3dfb7889c956832";
+ sha256 = "sha256-vcRHriFCT5b8SKjtRSg+kZDcCAKySC1cKVq+FMZb+9M=";
};
- vendorSha256 = "sha256-HmksSYA4974w+J/7PkMKEkXEfIkldj+kVywvsfLgE38=";
+ vendorSha256 = "sha256-p77mLvGtohmC8J+bqqkM5kqc1pMPcFx7GhXOZ4q4jeM=";
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 70fe396b8381..67b74bcbe44b 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 = "2022.10.2";
+ version = "2022.10.3";
components = {
"abode" = ps: with ps; [
abodepy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 4e7574744574..118701d24529 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -261,7 +261,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 = "2022.10.2";
+ hassVersion = "2022.10.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-bx4bixTWeOho8MG5yPBmVp07a7k8xfCli8OhQovG7Qw=";
+ hash = "sha256-5ffMs6gXOyg0hhB0Wx4bRmSqkr0uRhNcLhLo1PI2UqE=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 7fd948621571..5282874435f3 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20221006.0";
+ version = "20221010.0";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
- sha256 = "sha256-W4Hu9tH08Q7NSQz91XlECZuBmB5tIHuxGrrNEjl4pdE=";
+ sha256 = "sha256-TyaEnXHnaFk+V06BjeblYv6VnXsmYCc/7mYicJsBEY8=";
};
# there is nothing to strip in this package
diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
index 8019599752b6..4a7b3507730d 100644
--- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix
@@ -13,6 +13,11 @@ buildGoModule rec {
vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ=";
+ preCheck = ''
+ # Fix `insecure algorithm SHA1-RSA` problem
+ export GODEBUG=x509sha1=1;
+ '';
+
meta = with lib; {
description = "Exporter for NATS metrics";
homepage = "https://github.com/nats-io/prometheus-nats-exporter";
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 3761d72fd99e..eac918cafa2d 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, stdenv }:
buildGoModule rec {
pname = "influxdb";
@@ -24,5 +24,6 @@ buildGoModule rec {
license = licenses.mit;
homepage = "https://influxdata.com/";
maintainers = with maintainers; [ offline zimbatm ];
+ broken = stdenv.isDarwin; # build fails with go > 1.17
};
}
diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix
new file mode 100644
index 000000000000..ef3aa77278ca
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/6.0.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
+
+let
+ buildMongoDB = callPackage ./mongodb.nix {
+ inherit sasl boost Security CoreFoundation cctools;
+ };
+in
+buildMongoDB {
+ version = "6.0.1";
+ sha256 = "sha256-3LdyPHj2t7JskCJh6flCYl6qjfAbRXHsi+19L+0O2Zs=";
+ patches = [ ];
+}
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 82837e87d1a6..88dcfdcb7080 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -1,8 +1,27 @@
-{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
-, sasl, openssl, libpcap, python3, curl, Security, CoreFoundation, cctools, xz }:
+{ lib
+, stdenv
+, fetchurl
+, sconsPackages
+, boost
+, gperftools
+, pcre-cpp
+, snappy
+, zlib
+, libyamlcpp
+, sasl
+, openssl
+, libpcap
+, python3
+, curl
+, Security
+, CoreFoundation
+, cctools
+, xz
+}:
# Note:
-# The command line tools are written in Go as part of a different package (mongodb-tools)
+# The command line administrative tools are part of other packages:
+# see pkgs.mongodb-tools and pkgs.mongosh.
with lib;
@@ -11,17 +30,49 @@ with lib;
}:
let
- variants = if versionAtLeast version "4.2"
- then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
- scons = sconsPackages.scons_3_1_2.override { python = python3; }; # 4.2 < mongodb <= 5.0.x needs scons 3.x built with python3
- mozjsVersion = "60";
- mozjsReplace = "defined(HAVE___SINCOS)";
- }
- else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
- scons = sconsPackages.scons_3_1_2;
- mozjsVersion = "45";
- mozjsReplace = "defined(HAVE_SINCOS)";
- };
+ variants =
+ if versionAtLeast version "6.0" then rec {
+ python = scons.python.withPackages (ps: with ps; [
+ pyyaml
+ cheetah3
+ psutil
+ setuptools
+ packaging
+ pymongo
+ ]);
+
+ # 4.2 < mongodb <= 6.0.x needs scons 3.x built with python3
+ scons = sconsPackages.scons_3_1_2.override { python = python3; };
+
+ mozjsVersion = "60";
+ mozjsReplace = "defined(HAVE___SINCOS)";
+
+ } else if versionAtLeast version "4.2" then rec {
+ python = scons.python.withPackages (ps: with ps; [
+ pyyaml
+ cheetah3
+ psutil
+ setuptools
+ ]);
+
+ # 4.2 < mongodb <= 5.0.x needs scons 3.x built with python3
+ scons = sconsPackages.scons_3_1_2.override { python = python3; };
+
+ mozjsVersion = "60";
+ mozjsReplace = "defined(HAVE___SINCOS)";
+
+ } else rec {
+ python = scons.python.withPackages (ps: with ps; [
+ pyyaml
+ typing
+ cheetah
+ ]);
+
+ scons = sconsPackages.scons_3_1_2;
+ mozjsVersion = "45";
+ mozjsReplace = "defined(HAVE_SINCOS)";
+ };
+
system-libraries = [
"boost"
"pcre"
@@ -129,7 +180,10 @@ in stdenv.mkDerivation rec {
runHook postInstallCheck
'';
- installTargets = if (versionAtLeast version "4.4") then "install-core" else "install";
+ installTargets =
+ if (versionAtLeast version "6.0") then "install-devcore"
+ else if (versionAtLeast version "4.4") then "install-core"
+ else "install";
prefixKey = if (versionAtLeast version "4.4") then "DESTDIR=" else "--prefix=";
@@ -143,6 +197,9 @@ in stdenv.mkDerivation rec {
inherit license;
maintainers = with maintainers; [ bluescreen303 offline cstrahan ];
- platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
+ platforms = subtractLists systems.doubles.i686 (
+ if (versionAtLeast version "6.0") then systems.doubles.linux
+ else systems.doubles.unix
+ );
};
}
diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix
index fce125b35cd5..67ceb8fc37ff 100644
--- a/pkgs/tools/misc/czkawka/default.nix
+++ b/pkgs/tools/misc/czkawka/default.nix
@@ -8,7 +8,7 @@
, gdk-pixbuf
, atk
, gtk4
-, wrapGAppsHook
+, wrapGAppsHook4
, gobject-introspection
, xvfb-run
, testers
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
gobject-introspection
];
diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/tools/networking/iwgtk/default.nix
index ef220a8c28e2..c2781fbaf797 100644
--- a/pkgs/tools/networking/iwgtk/default.nix
+++ b/pkgs/tools/networking/iwgtk/default.nix
@@ -5,7 +5,7 @@
, ninja
, pkg-config
, scdoc
-, wrapGAppsHook
+, wrapGAppsHook4
, gtk4
, qrencode
}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
# patch systemd service to pass necessary environments and use absolute paths
patches = [ ./systemd-service.patch ];
- nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook ];
+ nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook4 ];
buildInputs = [ gtk4 qrencode ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78408aa0d6bd..a63f783a98e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10489,8 +10489,8 @@ with pkgs;
remarshal = with python3Packages; toPythonApplication remarshal;
- rehex = callPackage ../applications/editors/rehex {
- inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit;
+ rehex = darwin.apple_sdk_11_0.callPackage ../applications/editors/rehex {
+ inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit;
};
rig = callPackage ../tools/misc/rig { };
@@ -15197,22 +15197,35 @@ with pkgs;
# Below, the classic self-bootstrapping process
cbqn-bootstrap = lib.dontRecurseIntoAttrs {
+ # Use clang to compile CBQN if we aren't already.
+ # CBQN's upstream primarily targets and tests clang which means using gcc
+ # will result in slower binaries and on some platforms failing/broken builds.
+ # See https://github.com/dzaima/CBQN/issues/12.
+ #
+ # Known issues:
+ #
+ # * CBQN using gcc is broken at runtime on i686 due to
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58416,
+ # * CBQN uses some CPP macros gcc doesn't like for aarch64.
+ stdenv = if !stdenv.cc.isClang then clangStdenv else stdenv;
+
mbqn-source = buildPackages.mbqn.src;
phase0 = callPackage ../development/interpreters/bqn/cbqn {
+ inherit (cbqn-bootstrap) stdenv;
genBytecode = false;
bqn-path = null;
mbqn-source = null;
};
phase1 = callPackage ../development/interpreters/bqn/cbqn {
- inherit (cbqn-bootstrap) mbqn-source;
+ inherit (cbqn-bootstrap) mbqn-source stdenv;
genBytecode = true;
bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn";
};
phase2 = callPackage ../development/interpreters/bqn/cbqn {
- inherit (cbqn-bootstrap) mbqn-source;
+ inherit (cbqn-bootstrap) mbqn-source stdenv;
genBytecode = true;
bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn";
};
@@ -22330,10 +22343,7 @@ with pkgs;
umockdev = callPackage ../development/libraries/umockdev { };
- unconvert = callPackage ../development/tools/unconvert {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ unconvert = callPackage ../development/tools/unconvert { };
uncover = callPackage ../tools/security/uncover { };
@@ -23728,6 +23738,13 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
+ mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix {
+ sasl = cyrus_sasl;
+ boost = boost178.override { enableShared = false; };
+ inherit (darwin) cctools;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
+
nginx-sso = callPackage ../servers/nginx-sso { };
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix {
@@ -23738,10 +23755,7 @@ with pkgs;
immudb = callPackage ../servers/nosql/immudb { };
- influxdb = callPackage ../servers/nosql/influxdb {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ influxdb = callPackage ../servers/nosql/influxdb { };
influxdb2-server = callPackage ../servers/nosql/influxdb2 { };
influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { };
# For backwards compatibility with older versions of influxdb2,
@@ -23916,10 +23930,7 @@ with pkgs;
prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { };
prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
- prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix {
- # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild
- buildGoModule = buildGo117Module;
- };
+ prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { };
prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };
prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { };
@@ -30271,7 +30282,10 @@ with pkgs;
ostinato = libsForQt5.callPackage ../applications/networking/ostinato { };
- p4 = callPackage ../applications/version-management/p4 { };
+ p4 = callPackage ../applications/version-management/p4 {
+ inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security;
+ openssl = openssl_1_1;
+ };
p4d = callPackage ../applications/version-management/p4d { };
p4v = libsForQt515.callPackage ../applications/version-management/p4v { };
@@ -30441,7 +30455,10 @@ with pkgs;
diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
- diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; };
+ diff-pdf = callPackage ../applications/misc/diff-pdf {
+ wxGTK = wxGTK32;
+ inherit (darwin.apple_sdk.frameworks) Cocoa;
+ };
diffuse = callPackage ../applications/misc/diffuse { };
@@ -37032,7 +37049,7 @@ with pkgs;
};
wxsqlite3 = callPackage ../development/libraries/wxsqlite3 {
- wxGTK = wxGTK30;
+ wxGTK = wxGTK32;
inherit (darwin.apple_sdk.frameworks) Cocoa;
inherit (darwin.stubs) setfile rez derez;
};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b0dc1d3fbee..879ffec6287a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12000,8 +12000,8 @@ in {
};
wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {
- wxGTK = pkgs.wxGTK31.override {
- withGtk2 = false;
+ inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit;
+ wxGTK = pkgs.wxGTK31-gtk3.override {
withWebKit = true;
};
};