Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2023-12-02 18:01:17 +00:00
committed by GitHub
73 changed files with 2719 additions and 411 deletions
@@ -73,6 +73,7 @@ luaposix,,,,34.1.1-1,,vyp lblasc
luarepl,,,,,,
luarocks-build-rust-mlua,,,,,,mrcjkb
luasec,,,,,,flosse
luasnip,,,,,,
luasocket,,,,,,
luasql-sqlite3,,,,,,vyp
luassert,,,,,,
1 name src ref server version luaversion maintainers
73 luarepl
74 luarocks-build-rust-mlua mrcjkb
75 luasec flosse
76 luasnip
77 luasocket
78 luasql-sqlite3 vyp
79 luassert
@@ -8,7 +8,7 @@ In addition to numerous new and upgraded packages, this release has the followin
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- Create the first release note entry in this section!
- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment.
## New Services {#sec-release-24.05-new-services}
+23 -15
View File
@@ -1,33 +1,41 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkOption mkIf types;
cfg = config.programs.screen;
in
{
###### interface
options = {
programs.screen = {
enable = lib.mkEnableOption (lib.mdDoc "screen, a basic terminal multiplexer");
screenrc = mkOption {
default = "";
description = lib.mdDoc ''
The contents of /etc/screenrc file.
package = lib.mkPackageOptionMD pkgs "screen" { };
screenrc = lib.mkOption {
type = with lib.types; nullOr lines;
example = ''
defscrollback 10000
startup_message off
'';
type = types.lines;
description = lib.mdDoc "The contents of {file}`/etc/screenrc` file";
};
};
};
###### implementation
config = mkIf (cfg.screenrc != "") {
environment.etc.screenrc.text = cfg.screenrc;
environment.systemPackages = [ pkgs.screen ];
config = {
# TODO: Added in 24.05, remove before 24.11
assertions = [
{
assertion = cfg.screenrc != null -> cfg.enable;
message = "`programs.screen.screenrc` has been configured, but `programs.screen.enable` is not true";
}
];
} // lib.mkIf cfg.enable {
environment.etc.screenrc = {
enable = cfg.screenrc != null;
text = cfg.screenrc;
};
environment.systemPackages = [ cfg.package ];
security.pam.services.screen = {};
};
}
@@ -120,7 +120,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
item=${desktopItem}
wrapProgram "$out/$pname/bin/${loName}.sh" \
--prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git python3 ]}" \
--prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--suffix PATH : "${lib.makeBinPath [ python3 ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \
${lib.concatStringsSep " " extraWrapperArgs} \
--set-default JDK_HOME "$jdk" \
@@ -2287,12 +2287,12 @@ final: prev:
conform-nvim = buildVimPlugin {
pname = "conform.nvim";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "stevearc";
repo = "conform.nvim";
rev = "3fc2c956d99216b2816f07d2b946020ba2e02457";
sha256 = "1hv712cn3vn4gnr01a9maq787nb13x8nwachksnik49bq28g43g6";
rev = "e8ac7f1a9a3973ecce6942b2f26d16e65902aa70";
sha256 = "127shx9vzq9rkjk44xpr24w76b51fywwrni6nvrdq29swqdpk9yw";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -2348,12 +2348,12 @@ final: prev:
copilot-lua = buildVimPlugin {
pname = "copilot.lua";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot.lua";
rev = "3665ed0f3ef3ad68673df7195789d134d0d1fdb0";
sha256 = "1vsyjxqzq57ckmj942i018r1zg56l908fg8i5z3rv4qyqrwjz725";
rev = "38a41d0d78f8823cc144c99784528b9a68bdd608";
sha256 = "05v2cxa10s98pk7w0g3g8p440bz6n2r2k4ygxz9vkbcjf39kgjaj";
};
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
};
@@ -2480,12 +2480,12 @@ final: prev:
csv-vim = buildVimPlugin {
pname = "csv.vim";
version = "2023-09-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "chrisbra";
repo = "csv.vim";
rev = "4fd88346aed02123aa5daa1a363868a576c6fdcf";
sha256 = "10c2hgzhnv1zr461hvp4cnxpfs0aja43whjimdsb5sjd4xk5x7cc";
rev = "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b";
sha256 = "11gwamrqqmcy5jvbmnmyvx94pknlx3ppvyk4b6vhm4dghwmhq9nb";
};
meta.homepage = "https://github.com/chrisbra/csv.vim/";
};
@@ -3046,12 +3046,12 @@ final: prev:
dressing-nvim = buildVimPlugin {
pname = "dressing.nvim";
version = "2023-11-07";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "stevearc";
repo = "dressing.nvim";
rev = "fe3071330a0720ce3695ac915820c8134b22d1b0";
sha256 = "0a76mkvgya5hygfjbk2wbha18fhwhv6kmkxgvda053z325505mc6";
rev = "8b7ae53d7f04f33be3439a441db8071c96092d19";
sha256 = "1gj3apvif9bfz1vqrxr6xmj5p7byjq5qdjv159lnm09hca3vfdnb";
};
meta.homepage = "https://github.com/stevearc/dressing.nvim/";
};
@@ -3649,12 +3649,12 @@ final: prev:
fzf-lua = buildVimPlugin {
pname = "fzf-lua";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
rev = "474af4d6e2f0ebfbb5df85ca7827b67949717bae";
sha256 = "0236ccalzkwv2qzspqdglnkvpflzcppllp4v5bn6v1lbnlyqj7dm";
rev = "a1a2d0f42eaec400cc6918a8e898fc1f9c4dbc5f";
sha256 = "14pdspy8932fh5w247vqs0fyywb6mwg1af9sk5irgxfsv7c0xlg2";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@@ -3877,12 +3877,12 @@ final: prev:
go-nvim = buildVimPlugin {
pname = "go.nvim";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "ray-x";
repo = "go.nvim";
rev = "e0528b5868b8c488fb6eaf1a4f7b298976d419a5";
sha256 = "08xh4i09akm13gaj5zzlqlhcrr1i21jwqzxljf7i5wklpw7hf03c";
rev = "7b7c20029a817ef51f6b498388488e9850fe45ac";
sha256 = "0qbgmg9kvhxz4akmxd56lwr2zjxrayccgiynkcfnqakvya271jji";
};
meta.homepage = "https://github.com/ray-x/go.nvim/";
};
@@ -4080,24 +4080,24 @@ final: prev:
harpoon = buildVimPlugin {
pname = "harpoon";
version = "2023-10-10";
version = "2023-12-02";
src = fetchFromGitHub {
owner = "ThePrimeagen";
repo = "harpoon";
rev = "c1aebbad9e3d13f20bedb8f2ce8b3a94e39e424a";
sha256 = "0wqxg31z7gi7ap8r0057lpadywx3d245ghlljr6mkmp0jz3waad5";
rev = "c5f2d71c32a4aa2569bef1066e668947b78f9682";
sha256 = "1jn3sj3r1mczg5wyh7qcs51mab8sz02sgff5d2p3qhz0gjvyq22m";
};
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
};
haskell-tools-nvim = buildNeovimPlugin {
pname = "haskell-tools.nvim";
version = "2023-11-26";
version = "2023-12-02";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "haskell-tools.nvim";
rev = "8bfbba643d908e8757d591cf01e2241dd46b0858";
sha256 = "05np6ahzf6mk6ksfak12y7iwgfkrpkwhgf366bqlbk236g3k7sk0";
rev = "fdb248c2cc724b151b0886044b5fd8b88968d0d1";
sha256 = "0wj9aqihym10bmdybdmvlf8nlaghhfxl5z7gaamzbzlwhwlx71zy";
};
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
};
@@ -4271,12 +4271,12 @@ final: prev:
hotpot-nvim = buildVimPlugin {
pname = "hotpot.nvim";
version = "2023-10-20";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "hotpot.nvim";
rev = "eb5531b5f6285656408d1ed07b4d9bcc8067bad4";
sha256 = "0yl1l11dp58mg3bfk42ydcc7s2fxnnz6nlkkc09kxmdf4gxwr3wc";
rev = "05d9325e14ee1af9114b5c4586d1b200e75ccac9";
sha256 = "1ffhx1i9p7a13k6qmpry507ypk45sff6api5nnnc709bd7360743";
};
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
@@ -4439,12 +4439,12 @@ final: prev:
indent-blankline-nvim = buildVimPlugin {
pname = "indent-blankline.nvim";
version = "2023-10-30";
version = "2023-12-02";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
rev = "29be0919b91fb59eca9e90690d76014233392bef";
sha256 = "0z8n9d6f4qiq8m4ai1r2xz90955cp6cikqprq74ivfch3icrzdi1";
rev = "dbd90bb689ff10d21fee6792eb8928f0584b5860";
sha256 = "1fbx8l5m09qyis4d767gmmwa9rgify6vwjvj3b1jqfzhlz1fmd24";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -4860,12 +4860,12 @@ final: prev:
leap-nvim = buildVimPlugin {
pname = "leap.nvim";
version = "2023-10-22";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "b6ae80f8fc9993638608fc1a51c6ab0eeb12618c";
sha256 = "19nffffmczlqfsgjs10hqs9abgbygiv0ns64apk7gzf5anjaj0z1";
rev = "d55acc28ecc1f3ab3c396afd1f8b11a239285d9b";
sha256 = "0g4savdihdh15lddh5yj8vq5py9flzl59dqc93w6yx2kvj1r9ad2";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
@@ -5016,12 +5016,12 @@ final: prev:
lightspeed-nvim = buildVimPlugin {
pname = "lightspeed.nvim";
version = "2022-10-21";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
rev = "299eefa6a9e2d881f1194587c573dad619fdb96f";
sha256 = "1697plp2f6r5vmayi4xw23lj69pc31r3zh3p07rzxgl2ir4zrj1z";
rev = "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05";
sha256 = "1006047i88h1sad2xdi6h26vy13wnh4mnsdqqp4gpvh2sg6avnd5";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -5279,12 +5279,12 @@ final: prev:
lspsaga-nvim = buildVimPlugin {
pname = "lspsaga.nvim";
version = "2023-11-21";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
rev = "d3dfaea0125315110ea720c337ab88aa451d75e7";
sha256 = "07bm8gvzx68cdy7jkhva3caqjqazrh5hnhr3yi1qa6g1vlmnb0f7";
rev = "e9f08958e5f8410cadaa6388844788aedec5f78a";
sha256 = "1rhrjh36nlwrms9ikd3vfmvf1lh5m8wqx79n82g68lkaxch6g8v1";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};
@@ -5325,14 +5325,14 @@ final: prev:
meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
};
luasnip = buildVimPlugin {
luasnip = buildNeovimPlugin {
pname = "luasnip";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
rev = "1def35377854535bb3b0f4cc7a33c083cdb12571";
sha256 = "1g34ivzymgv214rpmwcmv91l4gp29q4r6cbv8xszzvxmc7dxcgkr";
rev = "118263867197a111717b5f13d954cd1ab8124387";
sha256 = "05gf35zb1m4baz3xiw8qh647l2w89861jljrhbbjnhnn48vfqgzw";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -5436,24 +5436,24 @@ final: prev:
mason-lspconfig-nvim = buildVimPlugin {
pname = "mason-lspconfig.nvim";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
rev = "41674c9d50f23cfa3e11f0ca964eb9100c2a8922";
sha256 = "030vyd0n45kd9j33kb20v8kx9pg66702525gnjbcrv5a8npldm1q";
rev = "4eb8e15e3c0757303d4c6dea64d2981fc679e990";
sha256 = "0ng3zhxcxdkpwd4zy17yl51h7bhknd3qv8j6rkbq1js237zv027p";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
mason-tool-installer-nvim = buildVimPlugin {
pname = "mason-tool-installer.nvim";
version = "2023-10-10";
version = "2023-12-02";
src = fetchFromGitHub {
owner = "WhoIsSethDaniel";
repo = "mason-tool-installer.nvim";
rev = "e4f34741daa9cf95de68a603d3e7a6844a69fdf0";
sha256 = "1pk19mlssn6f4pqm2j0kf9841nmxd0scphhrrd02w81gmsr912zh";
rev = "8b70e7f1e0a4119c1234c3bde4a01c241cabcc74";
sha256 = "1jxk8hz4p84f725f35hdkqnk6dnkanly86k89n7p551qwjs21mv0";
};
meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/";
};
@@ -5556,12 +5556,12 @@ final: prev:
mini-nvim = buildVimPlugin {
pname = "mini.nvim";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "964fab7fecd14f66a69a96162f8aa816480690fd";
sha256 = "1vxbjidpxhjbrbhg5kl4x4dcsn77nfybzbnlq4yjcpcsrmf8ms5i";
rev = "6d1cbcaec421b3768088b4047e78ce22e5503b99";
sha256 = "1924d432sym9qbp2q9h9gj5ky81vnxq1y4zzfrg5ay76clplaa95";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@@ -6036,12 +6036,12 @@ final: prev:
neogit = buildVimPlugin {
pname = "neogit";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
rev = "1ab1504ab87016e1d12b8f23543532a3006adb3b";
sha256 = "147k8rxcqqp85l1mjklak0bfzbwn2gkxkm4ykw01srkzy5jlhdwp";
rev = "d0e87541130b2cf62d7f8a54487ef99560232fb6";
sha256 = "16mmrhn83k8jrjavxbzq5ql32q2c9jqdgfx3a6hd2iv810y664qi";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
};
@@ -6108,12 +6108,12 @@ final: prev:
neorg = buildVimPlugin {
pname = "neorg";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "f4466457396717d10d2d235d019e0a80e1770087";
sha256 = "07gs0hdgy7q5sq3cj29jc8qlwsjmr74hqgy0l38pljbqxajigsww";
rev = "bf3daa2229c60f92f48ac6d7db3049b65fd01371";
sha256 = "0si90zng5x0p6qcrzzib8gifbxxw3m3sqbh22jiwwdjxwr3vhy9d";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@@ -6445,12 +6445,12 @@ final: prev:
nerdtree = buildVimPlugin {
pname = "nerdtree";
version = "2023-11-15";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
rev = "0cb04e9245b000daf32f04aae5f606011a6aa3b5";
sha256 = "1rws27wc2l3qahvbfd5b2i1js9kwldxxsfsn0abah96q2m1i3q85";
rev = "50a394b2bfa93674381cb913d6330e5075b5c787";
sha256 = "1p8qmnbi3l4y743db35sig5nxgqj83s20yyqhld9b5v0yr27rhbl";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
@@ -6589,12 +6589,12 @@ final: prev:
no-neck-pain-nvim = buildVimPlugin {
pname = "no-neck-pain.nvim";
version = "2023-11-29";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "shortcuts";
repo = "no-neck-pain.nvim";
rev = "0311b1654098b28c29a99007844dfa4bfe315b0a";
sha256 = "01rx8pf5qkga3x4y9902pwkjh0xifgba4xk6wfr0akn1slwd1g11";
rev = "968ad52ee472e950d104303c4c0bfcd3de664fe1";
sha256 = "0lqhi74fjvsflx642g04k2zf8i8dxfycmgd7hh0nkc6012b1ma3x";
};
meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
};
@@ -6613,12 +6613,12 @@ final: prev:
none-ls-nvim = buildVimPlugin {
pname = "none-ls.nvim";
version = "2023-11-29";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "nvimtools";
repo = "none-ls.nvim";
rev = "3a4826687da4310af379515086d71faca4d21288";
sha256 = "1fcln8z31cmmg0dclp8gwiy74pfa4ylic74pdf4mcsaqbm5blkr4";
rev = "7bf88cd3b37a411fdacfdca1745408a77a420493";
sha256 = "0ynlhj5vskv6laixs79lh334fxxkm0yx1vcgc9vyk9cr19v5109n";
};
meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
};
@@ -7236,12 +7236,12 @@ final: prev:
nvim-lspconfig = buildVimPlugin {
pname = "nvim-lspconfig";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "fcf153fbbf1facd16a71d46b92be8be495123a9f";
sha256 = "13h9nx74afvabrn51b4wjb6k6svidbmwq5czl03p3rp37lywkxcw";
rev = "694aaec65733e2d54d393abf80e526f86726c988";
sha256 = "16nrq7gxnk33qgpmcnjd8yq738vd7qpr2x77v7xf84qp2443nbkx";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -7464,12 +7464,12 @@ final: prev:
nvim-scrollview = buildVimPlugin {
pname = "nvim-scrollview";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "1b11329ece4cd25884b56c129aedc23ff1665d92";
sha256 = "0n7mqssagmq40glaiybmf8d5664665q32d9kbgz00jgnnj9n93ay";
rev = "7eb9030662fad8bfbc1df2c6cfc165aa4a8904b2";
sha256 = "1245qk1s00svnh57ijamziam8lm3d419a5vf3wry9fdf2lm01j1g";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -7596,12 +7596,12 @@ final: prev:
nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "b41bbcbb9a2c5543d3bfa4cf7e2b0948a5f61ce6";
sha256 = "1nsfxaxi2wkbs32kfxsbd23m2xx0fickffjgcprj079bgl64z47k";
rev = "80a16deb5146a3eb4648effccda1ab9f45e43e76";
sha256 = "0mgm5b80flk5171b3b2gsy2pjdimc0xbjbsdg4qf9hgzjyxf9jmi";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -7656,12 +7656,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPlugin {
pname = "nvim-treesitter-textobjects";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
rev = "aa7935c60aff501580b7f4872a7082e615ea5be3";
sha256 = "0j9fv564l4k1jf29h0mb5vnm2h1x3balrpnmchav527ylcaxhgmm";
rev = "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a";
sha256 = "1kdfwihk8ci827aq4w6xv7vn2740qpmh6dk892cd6yi0ab4zxvxn";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -7727,12 +7727,12 @@ final: prev:
nvim-ufo = buildVimPlugin {
pname = "nvim-ufo";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-ufo";
rev = "c1e75fb93a5413c73221e23d549cc9f208d592fb";
sha256 = "0kwxqrbb0n12bq3iqidk8i67ag4g6rdnqzk5gcjjvm6qlvvylggz";
rev = "47a2f8d4da670db6e01a7373cdf97249e332d6d4";
sha256 = "0k2l5ls9fhc53a7fvyz8p75n0b3spy7s3j4z9l3ilzvhd6m7al6d";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
};
@@ -7871,12 +7871,12 @@ final: prev:
oil-nvim = buildVimPlugin {
pname = "oil.nvim";
version = "2023-11-24";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
rev = "e89a8f8adeef2dfab851fd056d38ee7afc97c249";
sha256 = "1f5201yb7kqbggn0dgpl9p5mnxdxg6ffpfmzih7rzzkp4fhn2vb4";
rev = "58340545c6a01e5e9f7966df448714a156db137a";
sha256 = "0s3yd9336yqk8s8f07lf0195pn5q0ij1qphp0yaisrpxbfarl63p";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -8774,12 +8774,12 @@ final: prev:
rustaceanvim = buildNeovimPlugin {
pname = "rustaceanvim";
version = "2023-11-28";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "mrcjkb";
repo = "rustaceanvim";
rev = "bdd7155a18249f39a014115a8832ee770e503812";
sha256 = "0abwc7shfqcr31m7gaaxq07ym24s6gz8mkc49f5j0idcfj4k4n1v";
rev = "3cad6912b16d5e0a5375d465ca28fda4c6ea4ee9";
sha256 = "12lzw6jh7z5bvd7ss9xils11paiv3b9by31nlxfarnpcvqf0m9l4";
};
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
};
@@ -8875,7 +8875,7 @@ final: prev:
owner = "VonHeikemen";
repo = "searchbox.nvim";
rev = "110949af8963185b4e732b45ae57beb731bfcede";
sha256 = "1dahiggnc8hqfgd9akxlsyck7gxz05w0phrvahc5g1kskyr0q7h7";
sha256 = "sha256-Bx4Msp96hlcYVDvDC3gBv78zmde0T5XacxgiZt+LULU=";
};
meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/";
};
@@ -9256,12 +9256,12 @@ final: prev:
srcery-vim = buildVimPlugin {
pname = "srcery-vim";
version = "2023-11-13";
version = "2023-12-02";
src = fetchFromGitHub {
owner = "srcery-colors";
repo = "srcery-vim";
rev = "ffe6b8e975bb2f218cbeb3e785d2f12d9f88b37d";
sha256 = "0nwk81y9j5ljjm3k19kf1zmscdxiis4mwan026wv7cqp7f9qhxlr";
rev = "e605292319d9c964281d840ac87d3deddfc06559";
sha256 = "0b5zj2ilvhkv01n480gd6zylnhc3yhq9p7gcj0f12fn9yfihqdnf";
};
meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
};
@@ -9848,12 +9848,12 @@ final: prev:
telescope-project-nvim = buildVimPlugin {
pname = "telescope-project.nvim";
version = "2023-11-06";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-project.nvim";
rev = "5460c6c60d48618c5c746e5b1cad4c3e8262fdae";
sha256 = "0mj5sg698idk6lsaw6fd56j206vf0djv5sgaszjm4vffgc7666sb";
rev = "1aaf16580a614601a7f7077d9639aeb457dc5559";
sha256 = "1g03lnl79245d0vn7ydda4aixd2qbv9kcxc584msk7jwbc58r2xn";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
};
@@ -10077,12 +10077,12 @@ final: prev:
text-case-nvim = buildVimPlugin {
pname = "text-case.nvim";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "johmsalas";
repo = "text-case.nvim";
rev = "1680642717be198d5b16fc4de9b8080d77111270";
sha256 = "1hi1j2xnbqy0zmm06zfgwmikl6hphgkhbnhvdagap9h4nifpn9vz";
rev = "8f22e5fcbb8d591e04fa3e9780e2e16809278f9f";
sha256 = "0gpmfvj26kcm8ii9fhjgpwh5c571hy7xb253qq1vaak9cxa9m9yh";
};
meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
};
@@ -10438,12 +10438,12 @@ final: prev:
unison = buildVimPlugin {
pname = "unison";
version = "2023-11-30";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "d56c7c469b52448164d078e26802b2e3071b17b0";
sha256 = "1xflz3f5qm5injgzag7c4l2k4pflhv4knd5gpsxryzyxizlxkadl";
rev = "ebf9874e64a8c96041af727d2aa17033a8718f03";
sha256 = "1ndm54q3qg2hhcnh1bncjpmknczmngy9n6jgbr2wrxsvrsq8mb06";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@@ -12888,12 +12888,12 @@ final: prev:
vim-just = buildVimPlugin {
pname = "vim-just";
version = "2023-11-16";
version = "2023-12-01";
src = fetchFromGitHub {
owner = "NoahTheDuke";
repo = "vim-just";
rev = "fda7259fc3b16af1d16e467c1482aac3bcc4df9a";
sha256 = "0rfj8hknzwjp59x51wf99j4ymda4gnc2ly1rl3185dw4p3v7n4ph";
rev = "90e299ec91fa8ff88f73150f824f77f86b0f867e";
sha256 = "03kk30lskwhq5d1jmyhfws74l0iayrvsk7v0ki93k099k1fv5n7m";
};
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
};
@@ -1921,12 +1921,12 @@
};
rbs = buildGrammar {
language = "rbs";
version = "0.0.0+rev=192eda4";
version = "0.0.0+rev=23c69a4";
src = fetchFromGitHub {
owner = "joker1007";
repo = "tree-sitter-rbs";
rev = "192eda46774fd0281cdd41d372d5b4da86148780";
hash = "sha256-Bxgh7K3j0oPvZw7JX3kXFmaEAEKefB0A9ATmrbvXrB8=";
rev = "23c69a4fa9803abc9d87b235ca88d52418250041";
hash = "sha256-tdxx+feI0UIHkk1eS5VrIuYvOZWpuWF3NEioqrnZ+30=";
};
meta.homepage = "https://github.com/joker1007/tree-sitter-rbs";
};
@@ -48,16 +48,16 @@
, serviceSupport ? true
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "monado";
version = "unstable-2023-08-22";
version = "unstable-2023-11-09";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "monado";
rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6";
sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8=";
rev = "e983eecd73b1b91d2dfb356e1bc054e9202b2a7f";
hash = "sha256-a4ukfmJbDkhr7P3NMTfbuhXjyOta3WCc5gswX7KUAw0=";
};
nativeBuildInputs = [
@@ -135,16 +135,13 @@ stdenv.mkDerivation rec {
patches = [
# We don't have $HOME/.steam when building
./force-enable-steamvr_lh.patch
# A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado
./steamvr_lh-use-old-interface.patch
];
meta = with lib; {
description = "Open source XR runtime";
homepage = "https://monado.freedesktop.org/";
license = licenses.boost;
maintainers = with maintainers; [ expipiplus1 prusnak ];
maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ];
platforms = platforms.linux;
mainProgram = "monado-cli";
};
@@ -1,13 +0,0 @@
diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
index 24b69fd..5b3a5ca 100644
--- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
+++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp
@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver)
vr::EVRInitError err = driver->Activate(0);
VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str());
- auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent(vr::IVRDisplayComponent_Version));
+ auto *display = static_cast<vr::IVRDisplayComponent *>(driver->GetComponent("IVRDisplayComponent_003"));
VERIFY(display, "IVRDisplayComponent is null");
#undef VERIFY
@@ -4,11 +4,11 @@
lib,
}: let
pname = "upscayl";
version = "2.9.1";
version = "2.9.4";
src = fetchurl {
url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
hash = "sha256-x7tNGWXrg4hkr4d5QK4Z/cOmGGdbWLJ/GIASZjmiL4w=";
hash = "sha256-H9/z0NIqGGJPipioWvv67vIFQ46RZr5+ycm3NQrO9ZE=";
};
appimageContents = appimageTools.extractType2 {
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "clipcat";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "xrelkd";
repo = pname;
rev = "v${version}";
hash = "sha256-2Sh8VakHeAotdw1kkpRgNtLj1gnH1Ei7OC9INF/lkZo=";
hash = "sha256-P/8C+Gfmcuy7DGbH8+y6ZYlRrmV5t9U/uiykZ4bERSU=";
};
cargoHash = "sha256-cgyvIu56Ab3h6tgyQxtGsR0UPxgL65vb7fUAc0lMj5Q=";
cargoHash = "sha256-r2J5ysvLl7hKXfW+BIF15vBygUkuwNj222P1AckUu0E=";
nativeBuildInputs = [
protobuf
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eks-node-viewer";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kfX9BzARDWUOBIu67j60K38uwkRELxd/gXtEHOHAXS8=";
sha256 = "sha256-BK84hxbwZSJDO5WoyborJnVBS5pB69jTMU1csgiT0sw=";
};
vendorHash = "sha256-7axI7R8cTntc1IcOwVPmPj8MHeIvhbnkYKQdqu5fZOU=";
vendorHash = "sha256-EJAL5jNftA/g5H6WUMBJ98EyRp7QJ1C53EKr6GRz71I=";
ldflags = [
"-s"
@@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
description = "Desktop client for the Matrix protocol";
homepage = "https://github.com/Nheko-Reborn/nheko";
license = licenses.gpl3Plus;
mainProgram = "nheko";
maintainers = with maintainers; [ ekleog fpletz ];
platforms = platforms.all;
# Should be fixable if a higher clang version is used, see:
@@ -5,6 +5,7 @@
, libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin
, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
, libfaketime
, libinput, libcap, libjson, libsecret, libcanberra-gtk3
, homepage, version, prefix, hash
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
${homepage}
(if you do not find version ${version} there, try at
https://www.citrix.com/downloads/workspace-app/
https://www.citrix.com/downloads/workspace-app/)
Once you have downloaded the file, please use the following command and re-run the
installation:
@@ -80,11 +81,16 @@ stdenv.mkDerivation rec {
gtk_engines
heimdal
krb5
libcap
libcanberra-gtk3
libcxx
libcxxabi
libinput
libjpeg
libjson
libpng12
libpulseaudio
libsecret
libsoup
libvorbis
libxml2
@@ -119,6 +125,8 @@ stdenv.mkDerivation rec {
xorg.libXrender
xorg.libXtst
xorg.libxcb
xorg.xprop
xorg.xdpyinfo
];
installPhase = let
@@ -33,6 +33,17 @@ let
x86hash = "4a7da238286ae28d7baf0fefa1e7e09d077c8bc56c2bf7bec00da42c331bee59";
x64suffix = "17";
x86suffix = "17";
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest21.html";
};
"23.09.0" = {
major = "23";
minor = "9";
patch = "0";
x64hash = "7b06339654aa27258d6dfa922828b43256e780b282d07109f452246c7aa27514";
x86hash = "95436fb289602cf31c65b7df89da145fc170233cb2e758a2f11116f15b57d382";
x64suffix = "24";
x86suffix = "24";
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
@@ -10,8 +10,8 @@
}:
let
version = "1.3.0";
commit = "5bfe79b3632f15c442e8dc51ec206ab76354487f";
version = "1.3.1";
commit = "b6be8bac78605c21a9670db0e44faf5e1eafe0d4";
in buildGoModule {
pname = "gg-scm";
inherit version;
@@ -20,7 +20,7 @@ in buildGoModule {
owner = "gg-scm";
repo = "gg";
rev = "v${version}";
hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8=";
hash = "sha256-qw0KWhCkJVYRhDBNtiNactWGGMHjBwdQ1Po4lQQbaj4=";
};
postPatch = ''
substituteInPlace cmd/gg/editor_unix.go \
@@ -33,7 +33,7 @@ in buildGoModule {
"-X" "main.buildCommit=${commit}"
];
vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU=";
vendorHash = "sha256-56Sah030xbWsoOu8r3c3nN2UGHvQORheavebP+Z1Wc8=";
nativeBuildInputs = [ pandoc installShellFiles makeWrapper ];
nativeCheckInputs = [ bash coreutils git ];
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "got";
version = "0.93";
version = "0.94";
src = fetchurl {
url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz";
hash = "sha256-wlcnJr7f3Bd9SEgrKiPlr7pTSjaRj47qwktI2jepINE=";
hash = "sha256-hG0/a+sk6uZCxR908YfZCW44qx/SIwwGO9mUaxxHZ3k=";
};
nativeBuildInputs = [ pkg-config bison ]
@@ -22,13 +22,16 @@
, aprutil
, makeDesktopItem
, copyDesktopItems
, jq
, studioVariant ? false
}:
let
davinci = (
stdenv.mkDerivation rec {
pname = "davinci-resolve";
version = "18.5.1";
pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
version = "18.6.3";
nativeBuildInputs = [
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
@@ -47,19 +50,24 @@ let
rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-AZ869hA/WeCf3sxhdDOzD/q30P1NaD18TheBtS1ammQ=";
outputHash =
if studioVariant
then "sha256-OX8PyMhfl0jRdXBNsjlwkCAh8XUNJv8HEbmyAdjIv18="
else "sha256-PNzdVxGgXIHM2vi3ChHx67TQBFlCYBOZCiFkDi/RSu4=";
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
nativeBuildInputs = [ curl ];
nativeBuildInputs = [ curl jq ];
# ENV VARS
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
# Get linux.downloadId from HTTP response on https://www.blackmagicdesign.com/products/davinciresolve
DOWNLOADID = "defc1c6789b7475b9ee4a42daf9ba61d";
REFERID = "263d62f31cbb49e0868005059abcb0c9";
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
DOWNLOADSURL = "https://www.blackmagicdesign.com/api/support/us/downloads.json";
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download";
PRODUCT = "DaVinci Resolve${lib.optionalString studioVariant " Studio"}";
VERSION = version;
USERAGENT = builtins.concatStringsSep " " [
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})"
@@ -77,10 +85,16 @@ let
"street" = "Hogeweide 346";
"state" = "Province of Utrecht";
"city" = "Utrecht";
"product" = "DaVinci Resolve";
"product" = PRODUCT;
};
} ''
DOWNLOADID=$(
curl --silent --compressed "$DOWNLOADSURL" \
| jq --raw-output '.downloads[] | select(.name | test("^'"$PRODUCT $VERSION"'( Update)?$")) | .urls.Linux[0].downloadId'
)
echo "downloadid is $DOWNLOADID"
test -n "$DOWNLOADID"
RESOLVEURL=$(curl \
--silent \
--header 'Host: www.blackmagicdesign.com' \
@@ -95,7 +109,7 @@ let
--header 'Cookie: _ga=GA1.2.1849503966.1518103294; _gid=GA1.2.953840595.1518103294' \
--data-ascii "$REQJSON" \
--compressed \
"$SITEURL")
"$SITEURL/$DOWNLOADID")
curl \
--retry 3 --retry-delay 3 \
@@ -111,14 +125,17 @@ let
# The unpack phase won't generate a directory
sourceRoot = ".";
installPhase = ''
installPhase = let
appimageName = "DaVinci_Resolve_${lib.optionalString studioVariant "Studio_"}${version}_Linux.run";
in ''
runHook preInstall
export HOME=$PWD/home
mkdir -p $HOME
mkdir -p $out
appimage-run ./DaVinci_Resolve_${version}_Linux.run -i -y -n -C $out
test -e ${lib.escapeShellArg appimageName}
appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out
mkdir -p $out/{configs,DolbyVision,easyDCP,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT}
runHook postInstall
@@ -162,7 +179,9 @@ let
);
in
buildFHSEnv {
name = "davinci-resolve";
inherit (davinci) pname version;
name = null;
targetPkgs = pkgs: with pkgs; [
alsa-lib
aprutil
@@ -201,6 +220,7 @@ buildFHSEnv {
xorg.libXinerama
xorg.libXrandr
xorg.libXrender
xorg.libXt
xorg.libXtst
xorg.libXxf86vm
xorg.libxcb
@@ -213,16 +233,22 @@ buildFHSEnv {
zlib
];
extraBwrapArgs = lib.optionals studioVariant [
"--bind \"$HOME\"/.local/share/DaVinciResolve/license ${davinci}/.license"
];
runScript = "${bash}/bin/bash ${
writeText "davinci-wrapper"
''
export QT_XKB_CONFIG_ROOT="${xkeyboard_config}/share/X11/xkb"
export QT_PLUGIN_PATH="${davinci}/libs/plugins:$QT_PLUGIN_PATH"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci}/libs
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32:${davinci}/libs
${davinci}/bin/resolve
''
}";
passthru = { inherit davinci; };
meta = with lib; {
description = "Professional video editing, color, effects and audio post-processing";
homepage = "https://www.blackmagicdesign.com/products/davinciresolve";
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
version = "20.6.4";
version = "20.6.5";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
sha256 = "sha256-IrVz4rHAmaj/ACBNEF0x3kJa3fFPTTT7Pv9GnWJm8Vg=";
sha256 = "sha256-NrSLWZn+aeWUKxM/ETvoE4gRo4JZsD1snpLvMLDlpFw=";
};
meta = with lib; {
+2 -2
View File
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "bruno";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/usebruno/bruno/releases/download/v${version}/bruno_${version}_amd64_linux.deb";
hash = "sha256-60YwXAukGnMiaYxVOcUgGa/r/If1pJC6pMyyltTfd1c=";
hash = "sha256-E9aVyZWqY8XTwoUbHaj8VM32Eex7GNQcEpg8Hkk2O0U=";
};
nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ];
+31
View File
@@ -0,0 +1,31 @@
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "emojify";
version = "2.2.0";
src = fetchFromGitHub {
owner = "mrowa44";
repo = "emojify";
rev = version;
hash = "sha256-6cV+S8wTqJxPGsxiJ3hP6/CYPMWdF3qnz4ddL+F/oJU=";
};
installPhase = ''
runHook preInstall
install -Dm755 emojify $out/bin/emojify
runHook postInstall
'';
meta = with lib; {
description = "Emoji on the command line";
homepage = "https://github.com/mrowa44/emojify";
license = licenses.mit;
maintainers = with maintainers; [ snowflake ];
platforms = platforms.all;
mainProgram = "emojify";
};
}
+39
View File
@@ -0,0 +1,39 @@
{ lib
, stdenv
, fetchFromGitHub
, ffmpeg
, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "gifgen";
version = "1.2.0";
src = fetchFromGitHub {
owner = "lukechilds";
repo = "gifgen";
rev = version;
hash = "sha256-ni9RL4LyMejmu8vm5HC8WSTqAPQMBQNRDOZ4ZfvrkSU=";
};
nativeBuildInputs = [
makeWrapper
];
installPhase = ''
runHook preInstall
install -Dm755 gifgen $out/bin/gifgen
wrapProgram $out/bin/gifgen \
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
runHook postInstall
'';
meta = with lib; {
description = "Simple high quality GIF encoding";
homepage = "https://github.com/lukechilds/gifgen";
license = licenses.mit;
maintainers = with maintainers; [ snowflake ];
mainProgram = "gifgen";
platforms = platforms.all;
};
}
+2 -2
View File
@@ -42,13 +42,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "polybar";
version = "3.7.0";
version = "3.7.1";
src = fetchFromGitHub {
owner = "polybar";
repo = "polybar";
rev = finalAttrs.version;
hash = "sha256-Z1rL9WvEZHr5M03s9KCJ6O6rNuaK7PpwUDaatYuCocI=";
hash = "sha256-DX648jY1vewl3ImK84gF6/vtcSCg3wtgq6Ie3fCwZoA=";
fetchSubmodules = true;
};
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
version = "15.0.0";
version = "15.0.1";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-oX8xhSyK7D5gFvgTJuXK59kcuYDa/9w25ndfwfhGPDE=";
hash = "sha256-9vArmudz1Avxz46IS9FZIKbs8wZXoeWMd/FGLmpPitw=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-cTQrC4xXgx6HMMq5TqGnFLhGAHGt57zKXp1Cc8jEX8Y=";
cargoHash = "sha256-/mX9zUN+dZoOCOPMeWCJ9U7KfI6JnFl8B2leYosy2jQ=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];
+2 -2
View File
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.59.3"; # N.B: if you change this, please update:
version = "1.60.0"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-nsNaFshPlIt+B4Bw8djUqarI4mO/4YO8RcokCYibaaI=";
hash = "sha256-0mn+nQAgaurd1WomzcLUAYwp88l26qGkP+cP1SSYxsE=";
fetchSubmodules = true;
};
@@ -5,8 +5,10 @@
, cmake
, pkg-config
, check
, libxcrypt
, subunit
, python3Packages
, nix-update-script
, withDoc ? false
, graphviz-nox
@@ -31,13 +33,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "open62541";
version = "1.3.7";
version = "1.3.8";
src = fetchFromGitHub {
owner = "open62541";
repo = "open62541";
rev = "v${finalAttrs.version}";
hash = "sha256-XmoLmBGTMA6cejLiNU8hAVnHd35eh6lTIu9csmiR+4U=";
hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4=";
fetchSubmodules = true;
};
@@ -82,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
checkInputs = [
check
libxcrypt
subunit
];
@@ -126,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
rm -r bin/libopen62541*
'';
passthru.updateScript = nix-update-script { };
passthru.tests = let
open62541Full = encBackend: open62541.override {
withDoc = true;
@@ -151,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
OPC UA-based communication into existing applications.
'';
homepage = "https://www.open62541.org";
changelog = "https://github.com/open62541/open62541/releases/tag/v${finalAttrs.version}";
license = licenses.mpl20;
maintainers = with maintainers; [ panicgh ];
platforms = platforms.linux;
@@ -2183,6 +2183,29 @@ buildLuarocksPackage {
};
}) {};
luasnip = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, jsregexp, lua, luaOlder }:
buildLuarocksPackage {
pname = "luasnip";
version = "2.1.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/luasnip-2.1.1-1.rockspec";
sha256 = "1jrdai8qsanr6x2vqp70hipsxrxh0abvwr2xwh9p4wr29k4wyycb";
}).outPath;
src = fetchzip {
url = "https://github.com/L3MON4D3/LuaSnip/archive/v2.1.1.zip";
sha256 = "0mbpwf3sxfrmrza13d9w0hlcmzlrj551g332syp1qhs94abfnnrd";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ jsregexp lua ];
meta = {
homepage = "https://github.com/L3MON4D3/LuaSnip";
description = "Snippet Engine for Neovim written in Lua.";
license.fullName = "Apache-2.0";
};
}) {};
luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }:
buildLuarocksPackage {
pname = "luasocket";
+1 -1
View File
@@ -260,7 +260,7 @@ final: prev: {
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
hash = "sha256-rwpwB+vli3CXRhUFL+UvyUpPlxRk6P/2zLCn0SL9E6s=";
hash = "sha256-ej3h4LlF/pkAYeDxePb7wMc8zrfxKMnrp1ogZLoFU+0=";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiosomecomfort";
version = "0.0.22";
version = "0.0.24";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mkmer";
repo = "AIOSomecomfort";
rev = "refs/tags/${version}";
hash = "sha256-d4pyt9+sBPNo/PL05HQ4sjyjubMtTZI9WUGRU1B/dH0=";
hash = "sha256-+kAObq8tbTO6Qlb+/93mF6K+gEHd33TofHug5f+zl+4=";
};
nativeBuildInputs = [
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, zope_interface
, zope_testing
, zope-testing
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323";
};
propagatedBuildInputs = [ zope_interface zope_testing ];
propagatedBuildInputs = [ zope_interface zope-testing ];
# tests fail, see https://hydra.nixos.org/build/4316603/log/raw
doCheck = false;
@@ -15,21 +15,16 @@
buildPythonPackage rec {
pname = "faster-whisper";
version = "0.9.0";
version = "0.10.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "guillaumekln";
repo = "faster-whisper";
rev = "refs/tags/v${version}";
hash = "sha256-kHXX5Z4r7+lFRBtTCsPy9DILwsk3T1mcBzmJnCrKTdk=";
rev = "refs/tags/${version}";
hash = "sha256-qcpPQv5WoUkT92/TZ+MMq452FgPNcm3ZZ+ZNc0btOGE=";
};
postPatch = ''
substituteInPlace requirements.txt \
--replace "onnxruntime>=1.14,<2" "onnxruntime"
'';
propagatedBuildInputs = [
av
ctranslate2
@@ -54,7 +49,7 @@ buildPythonPackage rec {
'';
meta = with lib; {
changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/v${version}";
changelog = "https://github.com/guillaumekln/faster-whisper/releases/tag/${version}";
description = "Faster Whisper transcription with CTranslate2";
homepage = "https://github.com/guillaumekln/faster-whisper";
license = licenses.mit;
@@ -1,20 +1,36 @@
{ lib, fetchPypi, buildPythonPackage, flask, pythonOlder, pytestCheckHook }:
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, setuptools
, flask
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "flask-themes2";
version = "1.0.0";
format = "setuptools";
version = "1.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "Flask-Themes2";
inherit version;
hash = "sha256-0U0cSdBddb9+IG3CU6zUPlxaJhQlxOV6OLgxnNDChy8=";
hash = "sha256-gsMgQQXjhDfQRhm7H0kBy8jKxd75WY+PhHR6Rk/PUPs=";
};
nativeCheckInputs = [ pytestCheckHook ];
propagatedBuildInputs = [ flask ];
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
flask
];
nativeCheckInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Easily theme your Flask app";
@@ -29,7 +29,7 @@
, protobuf
}:
let
version = "0.2.32";
version = "0.2.33";
in
buildPythonPackage {
pname = "fschat";
@@ -40,7 +40,7 @@ buildPythonPackage {
owner = "lm-sys";
repo = "FastChat";
rev = "refs/tags/v${version}";
hash = "sha256-3IJcqVULOK0Nf72sgv80q9U8QZ3pNHLYaNwCQohdBB8=";
hash = "sha256-tfFgiYJBuVt71qHOmkDoSrZ2tvXStjubmkw7sexkGZg=";
};
nativeBuildInputs = [
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "ipykernel";
version = "6.25.2";
format = "pyproject";
version = "6.27.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-9Gjd0fF6y0jIzmf8+km6bUbU+awEOMH0Qb58PRNyIws=";
hash = "sha256-fV1ZS2aQZUtNKZ7bpehy3Be7c5ao0GCcl8t7ihxgXeY=";
};
# debugpy is optional, see https://github.com/ipython/ipykernel/pull/767
@@ -55,6 +55,6 @@ buildPythonPackage rec {
description = "IPython Kernel for Jupyter";
homepage = "https://ipython.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
maintainers = with lib.maintainers; [ fridh ] ++ lib.teams.jupyter.members;
};
}
@@ -5,9 +5,10 @@
, flaky
, ipykernel
, ipyparallel
, nose
, pre-commit
, pytestCheckHook
, pytest-asyncio
, pytest-timeout
}:
buildPythonPackage {
@@ -22,15 +23,26 @@ buildPythonPackage {
flaky
ipykernel
ipyparallel
nose
pre-commit
pytestCheckHook
pytest-asyncio
pytest-timeout
];
preCheck = ''
export HOME=$(mktemp -d)
'';
disabledTests = lib.optionals stdenv.isDarwin ([
disabledTests = [ # The follwing three tests fail for unclear reasons.
# pytest.PytestUnhandledThreadExceptionWarning: Exception in thread Thread-8
"test_asyncio_interrupt"
# DeprecationWarning: Passing unrecognized arguments to super(IPythonKernel)
"test_embed_kernel_func"
# traitlets.config.configurable.MultipleInstanceError: An incompatible siblin...
"test_install_kernelspec"
] ++ lib.optionals stdenv.isDarwin ([
# see https://github.com/NixOS/nixpkgs/issues/76197
"test_subprocess_print"
"test_subprocess_error"
@@ -5,7 +5,7 @@
, python
, isPy27
, six
, zope_testing
, zope-testing
}:
buildPythonPackage rec {
@@ -29,7 +29,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [ six ];
nativeCheckInputs = [ zope_testing ];
nativeCheckInputs = [ zope-testing ];
meta = with lib; {
description = "A documentation builder";
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, six
, zope_testing
, zope-testing
, setuptools
}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "39bc23bbb59b765702090ad61fe579f8bd9fe1f005f4dd1c2988a5bd1a71faf0";
};
propagatedBuildInputs = [ six setuptools zope_testing ];
propagatedBuildInputs = [ six setuptools zope-testing ];
# Huge amount of testing dependencies (including Zope2)
doCheck = false;
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pysignalclirestapi";
version = "0.3.21";
version = "0.3.22";
pyproject = true;
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "bbernhard";
repo = "pysignalclirestapi";
rev = version;
hash = "sha256-CAZ6UgGz7ZDXlQlngi+hEhczOphvAT/Yl9vLqnrS1Qc=";
hash = "sha256-m8Sihf5vTDntd5Tbaa5o55G/k/rqtmjWreoTab58CHU=";
};
nativeBuildInputs = [
@@ -1,33 +1,40 @@
{ lib
, isPy27
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, setuptools
, aiohttp
, demjson3
, python
, unittestCheckHook
}:
buildPythonPackage rec {
pname = "pysyncthru";
version = "0.7.10";
version = "0.8.0";
disabled = isPy27;
disabled = pythonOlder "3.7";
pyproject = true;
src = fetchFromGitHub {
owner = "nielstron";
repo = "pysyncthru";
rev = "release-${version}";
sha256 = "1c29w2ldrnq0vxr9cfa2pjhwdvrpw393c84khgg2y56jrkbidq53";
rev = "refs/tags/${version}";
hash = "sha256-Zije1WzfgIU9pT0H7T/Mx+5gEBCsRgMLkfsa/KB0YtI=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
demjson3
];
checkPhase = ''
${python.interpreter} -m unittest
'';
nativeCheckInputs = [
unittestCheckHook
];
pythonImportsCheck = [ "pysyncthru" ];
@@ -2,20 +2,36 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
, fetchpatch
, setuptools
, requests
}:
buildPythonPackage rec {
pname = "starline";
version = "0.2.0";
version = "0.1.5";
disabled = pythonOlder "3.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "550b00ab95cf59d933f7708abab40a4e41e5790e62b653471afe86a3af3320e6";
hash = "sha256-F1P1/NKml2rtd1r7A/g5IVnwQMZzkXzAxjRRDZXBPLk=";
};
patches = [
# https://github.com/Anonym-tsk/starline/pull/5
(fetchpatch {
url = "https://github.com/Anonym-tsk/starline/commit/4e6cdf8e05c5fb8509ee384e77b39a2495587160.patch";
hash = "sha256-y9b6ePH3IEgmt3ALHQGwH102rlm4KfmH4oIoIC93cWU=";
})
];
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
requests
];
@@ -1,7 +1,7 @@
{ buildPythonPackage
, fetchPypi
, mock
, zope_testing
, zope-testing
, lib
}:
@@ -15,7 +15,7 @@ buildPythonPackage rec {
};
buildInputs = [ mock ];
propagatedBuildInputs = [ zope_testing ];
propagatedBuildInputs = [ zope-testing ];
meta = with lib; {
description = "Inter-process locks";
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, zope_configuration
, zope-configuration
, zope-deferredimport
, zope-deprecation
, zope_event
@@ -22,7 +22,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
zope_configuration
zope-configuration
zope-deferredimport
zope-deprecation
zope_event
@@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, zope-i18nmessageid
, zope_interface
, zope_schema
, pytestCheckHook
, zope_testing
, zope_testrunner
, manuel
}:
buildPythonPackage rec {
pname = "zope-configuration";
version = "5.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "zope.configuration";
inherit version;
hash = "sha256-I0tKGMcfazub9rzyJSZLrgFJrGjeoHsHLw9pmkzsJuc=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
manuel
pytestCheckHook
zope_testing
zope_testrunner
];
propagatedBuildInputs = [
zope-i18nmessageid
zope_interface
zope_schema
];
# Need to investigate how to run the tests with zope-testrunner
doCheck = false;
pythonImportsCheck = [
"zope.configuration"
];
pythonNamespaces = [
"zope"
];
meta = with lib; {
description = "Zope Configuration Markup Language (ZCML)";
homepage = "https://github.com/zopefoundation/zope.configuration";
changelog = "https://github.com/zopefoundation/zope.configuration/blob/${version}/CHANGES.rst";
license = licenses.zpl21;
maintainers = with maintainers; [ goibhniu ];
};
}
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, zope_testing
, zope-testing
}:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
hash = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw=";
};
nativeCheckInputs = [ zope_testing ];
nativeCheckInputs = [ zope-testing ];
meta = with lib; {
description = "Supports the efficient creation of hookable objects";
@@ -12,7 +12,7 @@
, wsgiproxy2
, six
, mock
, zope_testing
, zope-testing
, zope_testrunner
, python
}:
@@ -50,7 +50,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
mock
zope_testing
zope-testing
zope_testrunner
];
@@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPyPy
, setuptools
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "zope-testing";
version = "5.0.1";
pyproject = true;
src = fetchPypi {
pname = "zope.testing";
inherit version;
hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk=";
};
nativeBuildInputs = [
setuptools
];
doCheck = !isPyPy;
nativeCheckInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"src/zope/testing/tests.py"
];
pythonImportsCheck = [
"zope.testing"
];
pythonNamespaces = [
"zope"
];
meta = with lib; {
description = "Zope testing helpers";
homepage = "https://github.com/zopefoundation/zope.testing";
changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst";
license = licenses.zpl21;
maintainers = with maintainers; [ goibhniu ];
};
}
@@ -1,33 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, zope-i18nmessageid
, zope_schema
, zope_testrunner
, manuel
}:
buildPythonPackage rec {
pname = "zope.configuration";
version = "4.4.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg=";
};
nativeCheckInputs = [ zope_testrunner manuel ];
propagatedBuildInputs = [ zope-i18nmessageid zope_schema ];
# Need to investigate how to run the tests with zope-testrunner
doCheck = false;
meta = with lib; {
description = "Zope Configuration Markup Language (ZCML)";
homepage = "https://github.com/zopefoundation/zope.configuration";
license = licenses.zpl20;
maintainers = with maintainers; [ goibhniu ];
};
}
@@ -4,7 +4,7 @@
, zope_location
, zope_event
, zope_interface
, zope_testing
, zope-testing
}:
buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k=";
};
propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ];
propagatedBuildInputs = [ zope_location zope_event zope_interface zope-testing ];
# ImportError: No module named 'zope.event'
# even though zope_event has been included.
@@ -1,30 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPyPy
, zope_interface
, zope_exceptions
, zope_location
}:
buildPythonPackage rec {
pname = "zope.testing";
version = "5.0.1";
src = fetchPypi {
inherit pname version;
hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk=";
};
doCheck = !isPyPy;
propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ];
meta = with lib; {
description = "Zope testing helpers";
homepage = "http://pypi.python.org/pypi/zope.testing";
license = licenses.zpl20;
maintainers = with maintainers; [ goibhniu ];
};
}
@@ -3,7 +3,7 @@
, fetchPypi
, zope_interface
, zope_exceptions
, zope_testing
, zope-testing
, six
}:
@@ -17,7 +17,7 @@ buildPythonPackage rec {
hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q=";
};
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
propagatedBuildInputs = [ zope_interface zope_exceptions zope-testing six ];
doCheck = false; # custom test modifies sys.path
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.222.0";
version = "0.223.2";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "sha256-IOy6zsDGUfiSeOalQnku/4uNyjqpz2bMcpmf7Vq9fyI=";
hash = "sha256-vjsqQuQxTywSx4c0lnDKrrNr5hfFog9UurhIctq14f4=";
};
postPatch = ''
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "FLOW_RELEASE=1" ];
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
installPhase = ''
install -Dm755 bin/flow $out/bin/flow
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "buildkit";
version = "0.12.3";
version = "0.12.4";
src = fetchFromGitHub {
owner = "moby";
repo = "buildkit";
rev = "v${version}";
hash = "sha256-ph44J90g5zOTi/+FVbdnDDJp1gXcxPt7coA1rvhsQSQ=";
hash = "sha256-nQvrd2W9xWWGTlwN5Q2E3rs67OUxZ4bIp+rK2W2PUww=";
};
vendorHash = null;
+310 -35
View File
@@ -321,11 +321,12 @@ version = "0.1.0"
dependencies = [
"anyhow",
"enumflags2",
"indoc",
"indoc 2.0.3",
"insta",
"query-engine-metrics",
"query-engine-tests",
"query-tests-setup",
"regex",
"reqwest",
"serde_json",
"tokio",
@@ -433,7 +434,7 @@ dependencies = [
"connection-string",
"either",
"enumflags2",
"indoc",
"indoc 2.0.3",
"lsp-types",
"once_cell",
"psl-core",
@@ -672,6 +673,16 @@ dependencies = [
"windows-sys 0.45.0",
]
[[package]]
name = "console_error_panic_hook"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
dependencies = [
"cfg-if",
"wasm-bindgen",
]
[[package]]
name = "convert_case"
version = "0.4.0"
@@ -860,29 +871,26 @@ dependencies = [
[[package]]
name = "cuid"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51294db11d38eb763c92936c5c88425d0090e27dce21dd15748134af9e53e739"
source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52"
dependencies = [
"base36",
"cuid-util",
"cuid2",
"hostname",
"num",
"once_cell",
"rand 0.8.5",
"sha3",
]
[[package]]
name = "cuid-util"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ea2bfe0336ff1b7ca74819b2df8dfae9afea358aff6b1688baa5c181d8c3713"
source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52"
[[package]]
name = "cuid2"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47d99cacd52fd67db7490ad051c8c1973fb75520174d69aabbae08c534c9d0e8"
source = "git+https://github.com/prisma/cuid-rust?branch=wasm32-support#81309f9a11f70d178bb545971d51ceb7da692c52"
dependencies = [
"cuid-util",
"num",
@@ -890,14 +898,38 @@ dependencies = [
"sha3",
]
[[package]]
name = "darling"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
dependencies = [
"darling_core 0.10.2",
"darling_macro 0.10.2",
]
[[package]]
name = "darling"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
dependencies = [
"darling_core",
"darling_macro",
"darling_core 0.13.4",
"darling_macro 0.13.4",
]
[[package]]
name = "darling_core"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim 0.9.3",
"syn 1.0.109",
]
[[package]]
@@ -914,13 +946,24 @@ dependencies = [
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
dependencies = [
"darling_core 0.10.2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
"darling_core",
"darling_core 0.13.4",
"quote",
"syn 1.0.109",
]
@@ -950,7 +993,7 @@ version = "0.1.0"
dependencies = [
"base64 0.13.1",
"expect-test",
"indoc",
"indoc 2.0.3",
"once_cell",
"psl",
"regex",
@@ -991,7 +1034,7 @@ name = "diagnostics"
version = "0.1.0"
dependencies = [
"colored",
"indoc",
"indoc 2.0.3",
"pest",
]
@@ -1036,7 +1079,7 @@ dependencies = [
"expect-test",
"flate2",
"indexmap 1.9.3",
"indoc",
"indoc 2.0.3",
"itertools",
"pretty_assertions",
"prisma-models",
@@ -1377,6 +1420,12 @@ dependencies = [
"syn 2.0.28",
]
[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "funty"
version = "2.0.0"
@@ -1506,8 +1555,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
[[package]]
@@ -1522,6 +1573,19 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "gloo-utils"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
dependencies = [
"js-sys",
"serde",
"serde_json",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "graphql-parser"
version = "0.3.0"
@@ -1822,12 +1886,35 @@ dependencies = [
"hashbrown 0.14.0",
]
[[package]]
name = "indoc"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
dependencies = [
"indoc-impl",
"proc-macro-hack",
]
[[package]]
name = "indoc"
version = "2.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
[[package]]
name = "indoc-impl"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
"syn 1.0.109",
"unindent",
]
[[package]]
name = "insta"
version = "1.21.2"
@@ -2310,9 +2397,9 @@ dependencies = [
[[package]]
name = "mobc"
version = "0.8.2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b"
checksum = "90eb49dc5d193287ff80e72a86f34cfb27aae562299d22fea215e06ea1059dd3"
dependencies = [
"async-trait",
"futures-channel",
@@ -2426,11 +2513,11 @@ dependencies = [
"enumflags2",
"expect-test",
"futures",
"indoc",
"indoc 2.0.3",
"mongodb",
"mongodb-client",
"mongodb-schema-describer",
"names",
"names 0.12.0",
"once_cell",
"psl",
"regex",
@@ -2527,6 +2614,15 @@ dependencies = [
"uuid",
]
[[package]]
name = "names"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da"
dependencies = [
"rand 0.3.23",
]
[[package]]
name = "names"
version = "0.12.0"
@@ -2972,6 +3068,12 @@ dependencies = [
"schema-ast",
]
[[package]]
name = "paste"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "pbkdf2"
version = "0.11.0"
@@ -3234,7 +3336,7 @@ dependencies = [
"dmmf",
"enumflags2",
"expect-test",
"indoc",
"indoc 2.0.3",
"log",
"lsp-types",
"once_cell",
@@ -3251,6 +3353,7 @@ dependencies = [
"bigdecimal",
"chrono",
"cuid",
"getrandom 0.2.10",
"itertools",
"nanoid",
"prisma-value",
@@ -3315,6 +3418,12 @@ dependencies = [
"version_check",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.20+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
version = "1.0.66"
@@ -3386,7 +3495,7 @@ dependencies = [
"dissimilar",
"either",
"expect-test",
"indoc",
"indoc 2.0.3",
"psl-core",
]
@@ -3398,7 +3507,7 @@ dependencies = [
"chrono",
"diagnostics",
"enumflags2",
"indoc",
"indoc 2.0.3",
"itertools",
"lsp-types",
"once_cell",
@@ -3463,16 +3572,23 @@ dependencies = [
"either",
"futures",
"hex",
"indoc 0.3.6",
"lru-cache",
"metrics 0.18.1",
"mobc",
"mysql_async",
"names 0.11.0",
"native-tls",
"num_cpus",
"once_cell",
"paste",
"percent-encoding",
"postgres-native-tls",
"postgres-types",
"quaint-test-macros",
"quaint-test-setup",
"rusqlite",
"serde",
"serde_json",
"sqlformat",
"thiserror",
@@ -3486,6 +3602,30 @@ dependencies = [
"uuid",
]
[[package]]
name = "quaint-test-macros"
version = "0.1.0"
dependencies = [
"darling 0.10.2",
"once_cell",
"proc-macro2",
"quaint-test-setup",
"quote",
"syn 1.0.109",
]
[[package]]
name = "quaint-test-setup"
version = "0.1.0"
dependencies = [
"async-trait",
"bitflags 1.3.2",
"names 0.11.0",
"once_cell",
"quaint",
"tokio",
]
[[package]]
name = "quanta"
version = "0.9.3"
@@ -3567,7 +3707,7 @@ dependencies = [
"enumflags2",
"graphql-parser",
"hyper",
"indoc",
"indoc 2.0.3",
"mongodb-query-connector",
"opentelemetry",
"opentelemetry-otlp",
@@ -3652,7 +3792,7 @@ dependencies = [
"colored",
"enumflags2",
"futures",
"indoc",
"indoc 2.0.3",
"insta",
"once_cell",
"prisma-value",
@@ -3668,11 +3808,40 @@ dependencies = [
"uuid",
]
[[package]]
name = "query-engine-wasm"
version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
"connection-string",
"console_error_panic_hook",
"futures",
"js-sys",
"log",
"prisma-models",
"psl",
"serde",
"serde-wasm-bindgen",
"serde_json",
"thiserror",
"tokio",
"tracing",
"tracing-futures",
"tracing-subscriber",
"tsify",
"url",
"user-facing-errors",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-logger",
]
[[package]]
name = "query-test-macros"
version = "0.1.0"
dependencies = [
"darling",
"darling 0.13.4",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -3687,7 +3856,7 @@ dependencies = [
"enumflags2",
"hyper",
"indexmap 1.9.3",
"indoc",
"indoc 2.0.3",
"itertools",
"jsonrpc-core",
"nom",
@@ -3746,6 +3915,29 @@ dependencies = [
"nibble_vec",
]
[[package]]
name = "rand"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
dependencies = [
"libc",
"rand 0.4.6",
]
[[package]]
name = "rand"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
dependencies = [
"fuchsia-cprng",
"libc",
"rand_core 0.3.1",
"rdrand",
"winapi",
]
[[package]]
name = "rand"
version = "0.7.3"
@@ -3790,6 +3982,21 @@ dependencies = [
"rand_core 0.6.4",
]
[[package]]
name = "rand_core"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
"rand_core 0.4.2",
]
[[package]]
name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]]
name = "rand_core"
version = "0.5.1"
@@ -3848,6 +4055,15 @@ dependencies = [
"num_cpus",
]
[[package]]
name = "rdrand"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
@@ -4266,7 +4482,7 @@ dependencies = [
"base64 0.13.1",
"connection-string",
"expect-test",
"indoc",
"indoc 2.0.3",
"jsonrpc-core",
"quaint",
"schema-connector",
@@ -4370,6 +4586,17 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "serde-wasm-bindgen"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
dependencies = [
"js-sys",
"serde",
"wasm-bindgen",
]
[[package]]
name = "serde_bytes"
version = "0.11.12"
@@ -4390,6 +4617,17 @@ dependencies = [
"syn 2.0.28",
]
[[package]]
name = "serde_derive_internals"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.28",
]
[[package]]
name = "serde_json"
version = "1.0.104"
@@ -4441,7 +4679,7 @@ version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
dependencies = [
"darling",
"darling 0.13.4",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -4624,7 +4862,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
name = "sql-ddl"
version = "0.1.0"
dependencies = [
"indoc",
"indoc 2.0.3",
]
[[package]]
@@ -4635,7 +4873,7 @@ dependencies = [
"connection-string",
"enumflags2",
"expect-test",
"indoc",
"indoc 2.0.3",
"pretty_assertions",
"psl",
"quaint",
@@ -4661,7 +4899,7 @@ dependencies = [
"connection-string",
"enumflags2",
"expect-test",
"indoc",
"indoc 2.0.3",
"jsonrpc-core",
"once_cell",
"pretty_assertions",
@@ -4722,7 +4960,7 @@ dependencies = [
"datamodel-renderer",
"either",
"enumflags2",
"indoc",
"indoc 2.0.3",
"once_cell",
"prisma-value",
"psl",
@@ -4753,7 +4991,7 @@ dependencies = [
"enumflags2",
"expect-test",
"indexmap 1.9.3",
"indoc",
"indoc 2.0.3",
"once_cell",
"pretty_assertions",
"prisma-value",
@@ -4820,6 +5058,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "strsim"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "strsim"
version = "0.10.0"
@@ -5494,6 +5738,31 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "tsify"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0"
dependencies = [
"gloo-utils",
"serde",
"serde_json",
"tsify-macros",
"wasm-bindgen",
]
[[package]]
name = "tsify-macros"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47"
dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
"syn 2.0.28",
]
[[package]]
name = "twox-hash"
version = "1.6.3"
@@ -5501,7 +5770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if",
"rand 0.7.3",
"rand 0.8.5",
"static_assertions",
]
@@ -5573,6 +5842,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
[[package]]
name = "unindent"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
[[package]]
name = "unreachable"
version = "1.0.0"
@@ -5614,7 +5889,7 @@ name = "user-facing-errors"
version = "0.1.0"
dependencies = [
"backtrace",
"indoc",
"indoc 2.0.3",
"itertools",
"quaint",
"serde",
@@ -14,13 +14,13 @@
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "5.4.1";
version = "5.6.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-KYPDocC6S6YhJeneyI++UmmpuAYDoX6okqgOtGetilw=";
sha256 = "sha256-zyF2NAOPNJe23tIuOHalsvnYytALKZq8QY1L8EWJMno=";
};
# Use system openssl.
@@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8=";
"cuid-1.3.2" = "sha256-ZihFrLerEIOdbJggaBbByRbC1sZRvF4M0LN2albB7vA=";
"graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4=";
"mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ=";
"postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw=";
@@ -214,7 +214,7 @@ index edae9b477..782904f49 100644
cloud init command '%{cmd}' failed on guest '%{guest_name}'.
command_deprecated: |-
The command 'vagrant %{name}' has been deprecated and is no longer functional
@@ -1238,23 +1238,6 @@ en:
@@ -1245,30 +1245,6 @@ en:
following command:
vagrant plugin install --local
@@ -225,12 +225,19 @@ index edae9b477..782904f49 100644
- again.
- plugin_missing_library: |-
- Vagrant failed to install the requested plugin because it depends
- on a library which is not currently installed on this system. The
- following library is required by the '%{name}' plugin:
- on development files for a library which is not currently installed
- on this system. The following library is required by the '%{name}'
- plugin:
-
- %{library}
-
- Please install the library and then run the command again.
- If a package manager is used on this system, please install the development
- package for the library. The name of the package will be similar to:
-
- %{library}-dev or %{library}-devel
-
- After the library and development files have been installed, please
- run the command again.
- plugin_missing_ruby_dev: |-
- Vagrant failed to install the requested plugin because the Ruby header
- files could not be found. Install the ruby development package for your
+4 -11
View File
@@ -5,9 +5,9 @@
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
version = "2.3.4";
version = "2.3.7";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "sha256-Q+sUYcbc/SOgw4ZXDmwqh24G0jiLvA8fDJyZ45OqLw8=";
hash = "sha256-+oqWMZqnuf9fSpkbd8vzf1SVSdhHN2JLzr76jyAEv0U=";
deps = bundlerEnv rec {
name = "${pname}-${version}";
@@ -21,7 +21,7 @@ let
vagrant = {
source = {
type = "url";
inherit url sha256;
inherit url hash;
};
inherit version;
};
@@ -48,7 +48,7 @@ in buildRubyGem rec {
doInstallCheck = true;
dontBuild = false;
src = fetchurl { inherit url sha256; };
src = fetchurl { inherit url hash; };
patches = [
./unofficial-installation-nowarn.patch
@@ -98,13 +98,6 @@ in buildRubyGem rec {
HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null
'';
# `patchShebangsAuto` patches this one script which is intended to run
# on foreign systems.
postFixup = ''
sed -i -e '1c#!/bin/sh -' \
$out/lib/ruby/gems/*/gems/vagrant-*/plugins/provisioners/salt/bootstrap-salt.sh
'';
passthru = {
inherit ruby deps;
};
@@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s8b3bsajwjyrjs53h0nrfrpzzgi8igsrslprhr6fgl80ig3plld";
sha256 = "sha256-z0VkRqFk3JU02ULQ+xQbywekzrJgz1YPDul//Ov5ajU=";
type = "gem";
};
version = "0.9.0";
version = "0.11.0";
};
fog-xml = {
dependencies = ["fog-core" "nokogiri"];
@@ -109,10 +109,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
sha256 = "sha256-RrLSRMxv8BqJv2EnRpDAn9vcpHqErp6sOQOegSMa7nw=";
type = "gem";
};
version = "2.8.0";
version = "2.8.2";
};
multi_json = {
groups = ["default"];
@@ -130,20 +130,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi";
sha256 = "sha256-INyAC4++TE9LWxZOaqOrgqNxvLJ+toXBZpYcNN2KItc=";
type = "gem";
};
version = "1.13.6";
version = "1.15.2";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
sha256 = "sha256-r2QSSDb908AOgwcD1/hz6l3qvekj83AGo59aXg2hY4c=";
type = "gem";
};
version = "1.6.0";
version = "1.7.1";
};
rexml = {
groups = ["default"];
@@ -155,6 +155,26 @@
};
version = "3.2.5";
};
xml-simple = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "sha256-0hEx5RnIbxpbwrbS1X1G5pmOR/GO0kmyXK2GQz29aV0=";
type = "gem";
};
version = "1.1.9";
};
diffy = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "sha256-NrQv++UTjdxWGCEHwkrY1rBm7P0odoKfOR46SZPYmuE=";
type = "gem";
};
version = "3.4.2";
};
ruby-libvirt = {
groups = ["default"];
platforms = [];
@@ -166,14 +186,14 @@
version = "0.8.0";
};
vagrant-libvirt = {
dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml"];
dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml" "xml-simple" "diffy"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j31y6sjhslj5yr0ssvb36ngm7prfsbdfj6131757jl0l0ri8pyv";
sha256 = "sha256-NMiRjrVQo2Ui9nOJwpDmNJUk+95gsT85pwFMIiw3bwQ=";
type = "gem";
};
version = "0.8.2";
version = "0.12.2";
};
}
+2 -2
View File
@@ -20,13 +20,13 @@
mkDerivation rec {
pname = "chiaki4deck";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "streetpea";
repo = pname;
rev = "v${version}";
hash = "sha256-udSGtpBUbxEZU9l+jLmUWJbkaCxKGoPuKAaYVmEEezk=";
hash = "sha256-W/t9uYApt8j5UMjtVWhFtq+IHmu9vi6M92I8N4kRtEk=";
fetchSubmodules = true;
};
+1 -1
View File
@@ -34,7 +34,7 @@ buildPythonPackage rec {
requests
sqlalchemy
zope-component
zope_configuration
zope-configuration
];
checkInputs = [
+2 -3
View File
@@ -34,7 +34,6 @@ let
lm_sensors
net-snmp
procps
unixtools.ping
];
mailq = runCommand "mailq-wrapper" { preferLocalBuild = true; } ''
@@ -76,8 +75,8 @@ stdenv.mkDerivation rec {
-e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|'
configureFlagsArray+=(
--with-ping-command='ping -4 -n -U -w %d -c %d %s'
--with-ping6-command='ping -6 -n -U -w %d -c %d %s'
--with-ping-command='${lib.getBin unixtools.ping}/bin/ping -4 -n -U -w %d -c %d %s'
--with-ping6-command='${lib.getBin unixtools.ping}/bin/ping -6 -n -U -w %d -c %d %s'
)
install -Dm555 ${share} $out/share
+3 -3
View File
@@ -9,7 +9,7 @@
}:
let
version = "0.1.1";
version = "0.1.2";
in buildGoModule {
pname = "owncast";
inherit version;
@@ -17,9 +17,9 @@ in buildGoModule {
owner = "owncast";
repo = "owncast";
rev = "v${version}";
hash = "sha256-nBTuvVVnFlC75p8bRCN+lNl9fExBZrsLEesvXWwNlAQ=";
hash = "sha256-pPBY2PcXe3k9G6kjj/vF5VB6DEmiwKDUrK4VGR4xNzU=";
};
vendorHash = "sha256-yjy5bDJjWk7UotBVqvVFiGx8mpfhpqMTxoQm/eWHcw4=";
vendorHash = "sha256-7HxiZh5X5AZVMiZT6B8DfOy6stJ3+dFEixwJYv5X0dY=";
propagatedBuildInputs = [ ffmpeg ];
+2 -2
View File
@@ -11,11 +11,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opensearch";
version = "2.11.0";
version = "2.11.1";
src = fetchurl {
url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";
hash = "sha256-j9bN09E4VikDPqvhRULfOjATme5KgVGrdv0rIPdd4Sw=";
hash = "sha256-km6z+Z9ZLnUY1dweJQrhHRu0XvdmqQIiqN8Ruy7jWpw=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nifi";
version = "1.23.2";
version = "1.24.0";
src = fetchzip {
url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
hash = "sha256-NRX0lEE5/HsYnZXtLDlPUpgWMsg/2Z3cRUnJwKDGxfw=";
hash = "sha256-8S06E8RiH/EnfAa60eRzjmHmzMn+3UZbykJpvFFXEho=";
};
nativeBuildInputs = [ makeWrapper ];
+20 -1
View File
@@ -8,6 +8,10 @@
, copyDesktopItems
, makeDesktopItem
, nix-update-script
, testers
, writeText
, runCommand
, fend
}:
rustPlatform.buildRustPackage rec {
@@ -58,11 +62,26 @@ rustPlatform.buildRustPackage rec {
})
];
passthru.updateScript = nix-update-script { };
passthru = {
updateScript = nix-update-script { };
tests = {
version = testers.testVersion { package = fend; };
units = testers.testEqualContents {
assertion = "fend does simple math and unit conversions";
expected = writeText "expected" ''
36 kph
'';
actual = runCommand "actual" { } ''
${lib.getExe fend} '(100 meters) / (10 seconds) to kph' > $out
'';
};
};
};
meta = with lib; {
description = "Arbitrary-precision unit-aware calculator";
homepage = "https://github.com/printfn/fend";
changelog = "https://github.com/printfn/fend/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ djanatyn liff ];
mainProgram = "fend";
+1746
View File
File diff suppressed because it is too large Load Diff
+8 -4
View File
@@ -2,14 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "vrc-get";
version = "1.1.3";
version = "1.3.0";
src = fetchFromGitHub {
owner = "anatawa12";
repo = pname;
rev = "v${version}";
hash = "sha256-CJBwW2QsLNLyNubawBPD+Cy74JrrdSUHe7JBSdbMnjY=";
fetchSubmodules = true;
hash = "sha256-FCLIc5c+50qGpBEbJ4bUSNAfQVdpeswNwiWrVcO91zI=";
};
nativeBuildInputs = [ pkg-config ];
@@ -19,7 +18,12 @@ rustPlatform.buildRustPackage rec {
# Make openssl-sys use pkg-config.
OPENSSL_NO_VENDOR = 1;
cargoHash = "sha256-PnNo+MmBo/Ke7pL6KwRKXz3gycJmbYefTRMWOvlCQaQ=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.15" = "sha256-UXBVZy3nf20MUh9jQdYeS5ygrZfeRWtiNRtiyMvkdSs=";
};
};
meta = with lib; {
description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)";
+3 -3
View File
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
version = "1.15.10";
version = "1.15.11";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = "gopass";
rev = "v${version}";
hash = "sha256-6s4rg2+oC+RB2gE4FQIY2MPmFSh+RxiZxaIuMI/T8hE=";
hash = "sha256-wgrZkRRMEWA9Lk9eW+iGi+dZNYfDVhRu1phimZC079c=";
};
vendorHash = "sha256-tbZpNraGVC+p6O1MOh4vPmcwUgW5ykg7rGTNOWKFk0M=";
vendorHash = "sha256-TvohrwSFVv5ylVRd6jPdRDyRRhqqWa0xey9KN9vtyY8=";
subPackages = [ "." ];
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "git-credential-gopass";
version = "1.15.10";
version = "1.15.11";
src = fetchFromGitHub {
owner = "gopasspw";
repo = "git-credential-gopass";
rev = "v${version}";
hash = "sha256-DQPjnCwpFOKN0ObPXPbwy7GK1VsPSj+pcLKjfSPPPRo=";
hash = "sha256-qnWgrpcj3DZQu5haP/5xqoO7eogkRjBmc8XpgFFNT6I=";
};
vendorHash = "sha256-gvnBlf0JfdrHSHTF+OQxBHFER5F910mruzCa/prvIYA=";
vendorHash = "sha256-bit4+YgQ+Y/TA2q7KdZwYTE3ZKBwL6tUam+tHzBMiQw=";
subPackages = [ "." ];
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gopass-hibp";
version = "1.15.10";
version = "1.15.11";
src = fetchFromGitHub {
owner = "gopasspw";
repo = "gopass-hibp";
rev = "v${version}";
hash = "sha256-v3FtWBi5H9LiFN/mowufonABr+aV3Z8MWBKiIUoy0NE=";
hash = "sha256-2XhvUIa8RxQ6CAKPGpL8/rBiJSX/WsSGtIpaHLIBM1E=";
};
vendorHash = "sha256-c4kk1RrvB+c+8IfbIsLRvG7O3cy+u9l+pDZ52XX1AhI=";
vendorHash = "sha256-i9PUqircNf+jz5gcr3rVIR4tD9/bkV2h6LiDFhjiLaw=";
subPackages = [ "." ];
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "gopass-jsonapi";
version = "1.15.10";
version = "1.15.11";
src = fetchFromGitHub {
owner = "gopasspw";
repo = "gopass-jsonapi";
rev = "v${version}";
hash = "sha256-3E55MNS9QBLeae+Dc7NqbVMGie6NUKMBMGvkMqKeWoE=";
hash = "sha256-wJlnm+sgFg55LW4RWGjcT538DgNhJtFjwgwgqwLWH50=";
};
vendorHash = "sha256-sarNWeBi93oXL9v2EkP/z2+Bd4TyNy+z6576hOCf1/Q=";
vendorHash = "sha256-qRmPO2WM9RD43twl5a47IT3xC1LGFwNF99ojIU2xg6A=";
subPackages = [ "." ];
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gopass-summon-provider";
version = "1.15.10";
version = "1.15.11";
src = fetchFromGitHub {
owner = "gopasspw";
repo = "gopass-summon-provider";
rev = "v${version}";
hash = "sha256-S4BPUl7KuRakHr2fvNobChfevFw1UAbAdpFUkwXcmxs=";
hash = "sha256-rbfzmr6HtGUBCjO9jkocSghTAN+aNXTsSsMC38HqgW0=";
};
vendorHash = "sha256-gvnBlf0JfdrHSHTF+OQxBHFER5F910mruzCa/prvIYA=";
vendorHash = "sha256-bit4+YgQ+Y/TA2q7KdZwYTE3ZKBwL6tUam+tHzBMiQw=";
subPackages = [ "." ];
+4 -1
View File
@@ -1764,6 +1764,8 @@ with pkgs;
davinci-resolve = callPackage ../applications/video/davinci-resolve { };
davinci-resolve-studio = callPackage ../applications/video/davinci-resolve { studioVariant = true; };
dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { };
donkey = callPackage ../tools/security/donkey { };
@@ -6857,8 +6859,9 @@ with pkgs;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_23_02_0
citrix_workspace_23_07_0
citrix_workspace_23_09_0
;
citrix_workspace = citrix_workspace_23_07_0;
citrix_workspace = citrix_workspace_23_09_0;
clima = callPackage ../tools/text/clima { };
+2
View File
@@ -467,11 +467,13 @@ mapAliases ({
zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";
zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26
zope_component = zope-component; # added 2023-07-28
zope_configuration = zope-configuration; # added 2023-11-12
zope_contenttype = zope-contenttype; # added 2023-10-11
zope_deprecation = zope-deprecation; # added 2023-10-07
zope_dottedname = zope-dottedname; # added 2023-11-12
zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
zope_proxy = zope-proxy; # added 2023-10-07
zope_testing = zope-testing; # added 2023-11-12
zxing_cpp = zxing-cpp; # added 2023-11-05
})
+2 -2
View File
@@ -16189,7 +16189,7 @@ self: super: with self; {
zope-component = callPackage ../development/python-modules/zope-component { };
zope_configuration = callPackage ../development/python-modules/zope_configuration { };
zope-configuration = callPackage ../development/python-modules/zope-configuration { };
zope-contenttype = callPackage ../development/python-modules/zope-contenttype { };
@@ -16225,7 +16225,7 @@ self: super: with self; {
zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { };
zope_testing = callPackage ../development/python-modules/zope_testing { };
zope-testing = callPackage ../development/python-modules/zope-testing { };
zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };