Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-02-05 00:02:31 +00:00 committed by GitHub
commit bc833a50cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 679 additions and 318 deletions

View file

@ -6638,6 +6638,12 @@
github = "jayeshbhoot";
githubId = 1915507;
};
jayman2000 = {
email = "jason@jasonyundt.email";
github = "Jayman2000";
githubId = 5579359;
name = "Jason Yundt";
};
jb55 = {
email = "jb55@jb55.com";
github = "jb55";

View file

@ -858,6 +858,12 @@
<literal>libax25</literal> package.
</para>
</listitem>
<listitem>
<para>
<literal>tvbrowser-bin</literal> was removed, and now
<literal>tvbrowser</literal> is built from source.
</para>
</listitem>
<listitem>
<para>
<literal>nixos-version</literal> now accepts

View file

@ -213,6 +213,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package.
- `tvbrowser-bin` was removed, and now `tvbrowser` is built from source.
- `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision
- The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path.

View file

@ -859,12 +859,12 @@ final: prev:
barbecue-nvim = buildVimPluginFrom2Nix {
pname = "barbecue.nvim";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "utilyre";
repo = "barbecue.nvim";
rev = "ed0a85f5212124cafb611af8365c162b64e4064d";
sha256 = "05ya1zpg86w6q9r1s3i8bm42hw5h612aa2jghl34j7z7pdwcy3ns";
rev = "572e4070d1f26ce7252570823598a656e828a9ec";
sha256 = "0k8mh345m8xxmss04zwscmpyfwxsa8pwd8pjklgv8njgxr5hk1hr";
};
meta.homepage = "https://github.com/utilyre/barbecue.nvim/";
};
@ -1315,12 +1315,12 @@ final: prev:
cmp-dictionary = buildVimPluginFrom2Nix {
pname = "cmp-dictionary";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "uga-rosa";
repo = "cmp-dictionary";
rev = "8b5acfbc79eea0bfe2c08ffeb8f137f13449ab56";
sha256 = "18j7rdq32xmmdh2bazfyv1q0d37ravz8x9brm8v1z9gracbly43a";
rev = "5662ec89119c49a806b77b5df7517017abe47f8e";
sha256 = "0md3msnkyw2dgkpgp12iskrdv7p4sywmdg4ifdmbcl56qn1dv5zr";
};
meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
};
@ -4235,12 +4235,12 @@ final: prev:
leap-nvim = buildVimPluginFrom2Nix {
pname = "leap.nvim";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ggandor";
repo = "leap.nvim";
rev = "6068651f7f2bdb379344de52b9833d82bce27cec";
sha256 = "0skyq97hzslpx3w5y6ikcqbblzn1yqfwmk1wxrrmwayvyfcqqh9j";
rev = "f565a9c4d92245d8b619235bebeaa73cc38aa40e";
sha256 = "1i40bi18wn7vg6mdcg0xp5zxk960lzj4kzda3syj51sv1pgdq802";
};
meta.homepage = "https://github.com/ggandor/leap.nvim/";
};
@ -4787,12 +4787,12 @@ final: prev:
mason-nvim = buildVimPluginFrom2Nix {
pname = "mason.nvim";
version = "2023-02-02";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "24846a00941ec020c8addc7f52040a1b2fc12174";
sha256 = "1civr6qrq7c0z50yx7y9ly6w76vv5a1h0iqa1rxw8spc7h66hdva";
rev = "9ec92c1945b11ba7e7e6730fd60fd44525f24a25";
sha256 = "0snf7j4x4cmwrw81bwm3fj8k07l8iriqwzc5c47bl2w94fpbynyc";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@ -4859,12 +4859,12 @@ final: prev:
mini-nvim = buildVimPluginFrom2Nix {
pname = "mini.nvim";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
rev = "4f97a8771a480bcacf1d1d0dbf82e47f682aba2c";
sha256 = "1pnivvwh9bfddmqvzgs4qsc3qy2m8j4zk31d5l6dgz8bfp45c7w1";
rev = "33e76b0c22465de03906ebd00c01b64a04e495b3";
sha256 = "0kxfwmvp7pgvqr6cqs6zf5dklq6n7vcgzr1dj435f8yg6zh90aah";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
@ -5255,16 +5255,28 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
rev = "2b956364bfd64cceecb12cf43dfe81d6b831fb35";
sha256 = "1ycr3s1g00imih7g8gqvyzj9rg0dh1qwdvn78cwfn0hqm24ab8dc";
rev = "2e9fd3a7cbdce0c90379c8bc52e0bca6726eba81";
sha256 = "02f77wwhb1wfk9bcvy5mnc4r2rdgw6b3pdmacizmjnd1a9ajqysn";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogen = buildVimPluginFrom2Nix {
pname = "neogen";
version = "2023-01-16";
src = fetchFromGitHub {
owner = "danymat";
repo = "neogen";
rev = "465af9d6c6fb7f360175991dcc23fc10917e3a06";
sha256 = "08frlngajmb1905f52xh299h8l3mf34lp4aa5rgs2hl96iafbjr3";
};
meta.homepage = "https://github.com/danymat/neogen/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-01-31";
@ -5327,12 +5339,12 @@ final: prev:
neorg = buildVimPluginFrom2Nix {
pname = "neorg";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-neorg";
repo = "neorg";
rev = "7cc4c95d685c96071f48d352b7378dfe8fcd24a1";
sha256 = "0rhn1j9sx0wcp13fzlrsy39mvqb4djy29l18pyyig293gqbgjfd7";
rev = "ac8828369cb2a4b2e1e17e6b495645585ed2a37b";
sha256 = "1ljyzvk3ff876sp4idfqq3ziqm7c6wc63kii3nsvh9i4m0w5i5af";
};
meta.homepage = "https://github.com/nvim-neorg/neorg/";
};
@ -5571,8 +5583,8 @@ final: prev:
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "9e3f9160360117276c6c1b795426b7be897cbb24";
sha256 = "1rw742ck7d8h6akqcskqxpxw41wakwg0nagb82fgq4blisjppgid";
rev = "c2db6cfd687df2fba323ba31ad0d862d6129f62c";
sha256 = "0k7mhz2k05qwyrx9iyc9psjfshxzw8p1618fiyr7cck9aphzwqlf";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@ -6239,12 +6251,12 @@ final: prev:
nvim-navic = buildVimPluginFrom2Nix {
pname = "nvim-navic";
version = "2023-01-26";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-navic";
rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a";
sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq";
rev = "7e9d2b2b601149fecdccd11b516acb721e571fe6";
sha256 = "02dzs5bh29ncvz3nzc2isnz9y5c99mx5qm97nvwrbbvxcp3yah2m";
};
meta.homepage = "https://github.com/smiteshp/nvim-navic/";
};
@ -6419,12 +6431,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "0e6d4b4172f30c4aa44a9adc9ea5719723a1fac3";
sha256 = "1n98salqvdh23yxkx1m490sf6hvjqjzpyxm459sk33znj2j7nzvv";
rev = "bd7b4b6eff2dcb4a8a65f55d51398e79fa3d4ec6";
sha256 = "08amxr13yfqi2301lrdb0swl6wfjkbi3i7cq5r5ypyw7xaj1nbqb";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7008,12 +7020,12 @@ final: prev:
purescript-vim = buildVimPluginFrom2Nix {
pname = "purescript-vim";
version = "2022-12-07";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "purescript-contrib";
repo = "purescript-vim";
rev = "7af25a840d38dc6767c85edd1f35c1f835618071";
sha256 = "1aw0bd0cx76ldm5nx17lqsxshlaiw8v9j0rwf1mlbz5k40c5v2w9";
rev = "9a01f01991ca52ae835da09f483aeeeb79639739";
sha256 = "0ix3gxh1d3iw9zjmw41yc3fk2dxz5xi5j0l7bn4xv7shbdpki1la";
};
meta.homepage = "https://github.com/purescript-contrib/purescript-vim/";
};
@ -8765,6 +8777,18 @@ final: prev:
meta.homepage = "https://github.com/chrisbra/unicode.vim/";
};
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-02-03";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "59acc0cbe429492a99bfebf2b783fc2fa3967f75";
sha256 = "1nrpxprq1f2pp269nrx18avv7ghngqlr7rjahib91rgkvhw6k1x7";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
unite-vim = buildVimPluginFrom2Nix {
pname = "unite.vim";
version = "2021-02-06";
@ -10523,8 +10547,8 @@ final: prev:
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "eec8223171cca6e662dfca22ddde93c3a81f66d0";
sha256 = "1fm1l1am2hf7j95cf51q9i5l1sr5zh2y4r0xp78cm3bcwjyhnf7a";
rev = "58437d8250cc3355b565725073f51ff0ff77cea6";
sha256 = "1fsrhyawry2m4dq7lrh1zvanxn2qi35lqg1al92w065sf62mds9z";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -11133,12 +11157,12 @@ final: prev:
vim-ledger = buildVimPluginFrom2Nix {
pname = "vim-ledger";
version = "2023-02-03";
version = "2023-02-04";
src = fetchFromGitHub {
owner = "ledger";
repo = "vim-ledger";
rev = "ab78b1b16601274c1b93a43792080ef3faff06e9";
sha256 = "0k2h8508x6ga4gayrknrdqh6w5jhpf4vbz0ba8018264pnvz9fqd";
rev = "9b18bd548ec1fd6e94b262b3af0d9fb337c0b1df";
sha256 = "1paqjvvrcgngpggwa2a57d85xzvz5g5mk43bzn5fkgc1xfd77yv1";
};
meta.homepage = "https://github.com/ledger/vim-ledger/";
};
@ -14057,8 +14081,8 @@ final: prev:
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "e1920ebe46e3f22dbfa2dc3633f5d2539302c8f3";
sha256 = "125zmsr09rglj0q4lhbvpvkhwm684rgwzcdlps9pbqzk88h2cl94";
rev = "9a7013874a9d5e0413039fc9ded613fcdbd59cbd";
sha256 = "1n9dkd6wlghw1b011xnja2h36l68x5pi3cf7f4khw7zfk0f49r1k";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};

View file

@ -135,6 +135,17 @@
};
meta.homepage = "https://github.com/amaanq/tree-sitter-capnp";
};
chatito = buildGrammar {
language = "chatito";
version = "3baf22e";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-chatito";
rev = "3baf22e7e507cedf15d1dbc03df8afa50a625586";
hash = "sha256-NsdkvMkrHfVakeYxPJfr4HOg5BlLB6OPFQeMseQQL/k=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito";
};
clojure = buildGrammar {
language = "clojure";
version = "262d6d6";
@ -459,12 +470,12 @@
};
gdscript = buildGrammar {
language = "gdscript";
version = "a8fa839";
version = "4849e65";
src = fetchFromGitHub {
owner = "PrestonKnopp";
repo = "tree-sitter-gdscript";
rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c";
hash = "sha256-uSpic8MKMvl1p7LOHNn5EJGp1iOYkeqcRt7skdROmBo=";
rev = "4849e657b98945cd040ffa7fd833d6130259dbab";
hash = "sha256-Rs1W2jahp+J42JzICi+QLAqfHYXth47g4LjejJnJypo=";
};
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
};
@ -1313,12 +1324,12 @@
};
ruby = buildGrammar {
language = "ruby";
version = "7a1921b";
version = "206c707";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-ruby";
rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4";
hash = "sha256-niL8gqKv1Nq1z8y4c49amqkDo+FoIP3XEJz+dV2UmWo=";
rev = "206c7077164372c596ffa8eaadb9435c28941364";
hash = "sha256-1kQ3RP2lJ0vwvVmKAQYNyPjltEKZLiZ4iI8iIxcRGd8=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby";
};
@ -1423,12 +1434,12 @@
};
sql = buildGrammar {
language = "sql";
version = "30e15d4";
version = "c508e60";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "30e15d45dceb24ea51acf81ee7d75d81567b6e02";
hash = "sha256-s8jeS8FRDPQQ9Iq0Vi12GrshM/E8opdPI0Xxre5oL0I=";
rev = "c508e6044adf4298d7b321f966c90cbe32d75d23";
hash = "sha256-Ed+6pwxwvwLKOVB9XVHF+IftEiO4bG0yZAe77xBcazI=";
};
generate = true;
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
@ -1739,12 +1750,12 @@
};
zig = buildGrammar {
language = "zig";
version = "d90d38d";
version = "b0693dd";
src = fetchFromGitHub {
owner = "maxxnino";
repo = "tree-sitter-zig";
rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca";
hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A=";
rev = "b0693dd473efd91d6085acd8e0ff9c627d37e077";
hash = "sha256-Jmz2XDI+mrBYE2TEhxPJZbICbhs5AOC0tyC4OOgT61U=";
};
meta.homepage = "https://github.com/maxxnino/tree-sitter-zig";
};

View file

@ -991,6 +991,11 @@ self: super: {
'';
});
unison = super.unison.overrideAttrs (old: {
# Editor stuff isn't at top level
postPatch = "cd editor-support/vim";
});
vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: {
# on linux can use either Zenity or Yad.
propagatedBuildInputs = [ gnome.zenity ];

View file

@ -442,6 +442,7 @@ https://github.com/folke/neoconf.nvim/,HEAD,
https://github.com/KeitaNakamura/neodark.vim/,,
https://github.com/folke/neodev.nvim/,HEAD,
https://github.com/sbdchd/neoformat/,,
https://github.com/danymat/neogen/,HEAD,
https://github.com/TimUntersberger/neogit/,,
https://github.com/Shougo/neoinclude.vim/,,
https://github.com/neomake/neomake/,,
@ -735,6 +736,7 @@ https://github.com/leafgarland/typescript-vim/,,
https://github.com/SirVer/ultisnips/,,
https://github.com/mbbill/undotree/,,
https://github.com/chrisbra/unicode.vim/,,
https://github.com/unisonweb/unison/,,
https://github.com/Shougo/unite.vim/,,
https://github.com/axieax/urlview.nvim/,,
https://github.com/vim-scripts/utl.vim/,,

View file

@ -0,0 +1,70 @@
{ lib
, stdenvNoCC
, buildDotnetModule
, fetchFromGitHub
, fetchpatch
, dotnetCorePackages
, gtk4
, libadwaita
, pkg-config
, wrapGAppsHook4
, glib
, shared-mime-info
, python3
, desktop-file-utils
, gdk-pixbuf
}:
buildDotnetModule rec {
pname = "denaro";
version = "2023.1.1";
src = fetchFromGitHub {
owner = "nlogozzo";
repo = "NickvisionMoney";
rev = version;
hash = "sha256-U6/laqmOS7ZUhgCCHggIn1U3GyQ/wy05XuCcqc7gtVQ=";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;
dotnet-runtime = dotnetCorePackages.runtime_7_0;
projectFile = "NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj";
nugetDeps = ./deps.nix;
executables = "NickvisionMoney.GNOME";
# Prevent installing native libraries for all platforms
dotnetBuildFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ];
dotnetInstallFlags = [ "--runtime" (dotnetCorePackages.systemToDotnetRid stdenvNoCC.hostPlatform.system) ];
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
glib # For glib-compile-resources
shared-mime-info # For update-mime-database
python3
desktop-file-utils
gdk-pixbuf # Fixes icon missing in envs where GDK_PIXBUF_MODULE_FILE is not set
];
postInstall = ''
sh NickvisionMoney.GNOME/install_extras.sh $out
desktop-file-edit $out/share/applications/org.nickvision.money.desktop \
--set-key=Exec --set-value=$out/bin/NickvisionMoney.GNOME
'';
runtimeDeps = [
gtk4
libadwaita
glib # Fixes "Could not retrieve parent type - is the typeid valid?"
];
meta = with lib; {
description = "Personal finance manager for GNOME";
homepage = "https://github.com/nlogozzo/NickvisionMoney";
mainProgram = "NickvisionMoney.GNOME";
license = licenses.mit;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,40 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; })
(fetchNuGet { pname = "GirCore.Adw-1"; version = "0.2.0"; sha256 = "1lvyw61kcjq9m6iaw7c7xfjk1b99ccsh79819qnigdi37p7dgb7y"; })
(fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.2.0"; sha256 = "14jr3476h3lr3s0iahyf9in96631h7b8g36wpfgr0gz6snic6ch1"; })
(fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.2.0"; sha256 = "0as1iknxx8vd5c0snf3bssij20fy74dbzaqbq60djf7v4c5q46nq"; })
(fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.2.0"; sha256 = "19rh6mm2zxg46gdnizic4v6pmdk2hx25r4k12r8z4mkbmzpmcaaf"; })
(fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.2.0"; sha256 = "11v4zplb7flh24vn1pralanzjm9jlnmx8r867ihvzj73mphmzs6m"; })
(fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.2.0"; sha256 = "0489ba4gw6wq1ndlrhfi7pmnifvnhq52p0riih60lrhgi3664ybc"; })
(fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.2.0"; sha256 = "0ms6gbrrinznhvs15mhfm3xh4zlqv5j4sw2zgajisiiprdzh2rcz"; })
(fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.2.0"; sha256 = "17qk1zhvfmmywndv2n6d3hg0gs1cwmxlmsns5ink7g8prwfp0vpf"; })
(fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.2.0"; sha256 = "0gkj37rrazksvyc4nq3scmch7mxlcj40w8kwsmfvmvyl58z2faq7"; })
(fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.2.0"; sha256 = "0qxw84hl40rbgjcxwx4rhmi4dif519kbdypazl2laz14pirh0b8v"; })
(fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.2.0"; sha256 = "1klskbfkaaqy5asy83hbgb64pziib63s6d0szx3i3z24ynwhqjp3"; })
(fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.2.0"; sha256 = "03vp892bzy3nm5x35aqg8ripkw2n9gc86fqm3pr9fa1l88dhbqnl"; })
(fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.2.0"; sha256 = "158bsyirbdzyxnyphgzl8p6mxw1f9xbjpd92aijxk4hwdjvgn9hn"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.1"; sha256 = "1abakjiljrh0jabdk2bdgbi7lwzrzxmkkd8p5sm67xm5f4ni8db5"; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.1"; sha256 = "1vkgng2rmpmazklwd9gnyrdngjf2n8bdm2y55njzny2fwpdy82rq"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
(fetchNuGet { pname = "QuestPDF"; version = "2022.12.0"; sha256 = "0hkcw871jm77jqbgnbxixd5nxpxzzz0jcr61adsry2b15ymzmkb1"; })
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
(fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.2"; sha256 = "07rc4pj3rphi8nhzkcvilnm0fv27qcdp68jdwk4g0zjk7yfvbcay"; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; })
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.2"; sha256 = "0jn98bkjk8h4smi09z31ib6s6392054lwmkziqmkqf5gf614k2fz"; })
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.2"; sha256 = "0bnm2fhvcsyg5ry74gal2cziqnyf5a8d2cb491vsa7j41hbbx7kv"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; })
]

View file

@ -46,13 +46,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-57";
version = "7.1.0-60";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-1fFsrsrY8AAMr6miG8OPZIYaVZhtVi5kEaI/96dzip8=";
hash = "sha256-dQfmW9rt66eWOaKbZ9j8jc1k8v+F8B9TpTx12L+0VE4=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View file

@ -2,7 +2,7 @@
, karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash, breeze-icons
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib, libjxl
, openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp
, qtmultimedia, qtx11extras, quazip
, python3Packages
@ -26,7 +26,7 @@ mkDerivation rec {
buildInputs = [
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib libjxl
openjpeg opencolorio_1 poppler curl ilmbase libmypaint libwebp
qtmultimedia qtx11extras quazip
python3Packages.pyqt5

View file

@ -23,11 +23,11 @@
stdenv.mkDerivation rec {
pname = "vkdt";
version = "0.5.3";
version = "0.5.4";
src = fetchurl {
url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc=";
sha256 = "sha256-lyljfJ4RZETEED4bofC/Rq88PMNhoHO1kgHmmaXPuhM=";
};
strictDeps = true;
@ -67,6 +67,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ paperdigits ];
platforms = platforms.linux;
broken = stdenv.isAarch64;
};
}

View file

@ -1,55 +0,0 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }:
let
desktopItem = makeDesktopItem {
name = "tvbrowser";
exec = "tvbrowser";
icon = "tvbrowser";
comment = "Themeable and easy to use TV Guide";
desktopName = "TV-Browser";
genericName = "Electronic TV Program Guide";
categories = [ "AudioVideo" "TV" "Java" ];
startupNotify = true;
startupWMClass = "tvbrowser-TVBrowser";
};
in stdenv.mkDerivation rec {
pname = "tvbrowser";
version = "4.0.1";
name = "${pname}-bin-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz";
sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/share/java/${pname}
cp -R * $out/share/java/${pname}
rm $out/share/java/${pname}/${pname}.{sh,desktop}
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
for i in 16 32 48 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
done
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/java/${pname}/${pname}.jar" \
--chdir "$out/share/java/${pname}"
'';
meta = with lib; {
description = "Electronic TV Program Guide";
homepage = "https://www.tvbrowser.org/";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -0,0 +1,87 @@
{ lib
, fetchurl
, stdenv
, fetchzip
, ant
, jdk
, makeWrapper
, callPackage
}:
let
minimalJavaVersion = "11";
newsPlugin = fetchurl {
url = "https://www.tvbrowser.org/data/uploads/1372016422809_543/NewsPlugin.jar";
hash = "sha256-5XoypuMd2AFBE2SJ6EdECuvq6D81HLLuu9UoA9kcKAM=";
};
in
assert lib.versionAtLeast jdk.version minimalJavaVersion;
stdenv.mkDerivation rec {
pname = "tvbrowser";
version = "4.2.7";
src = fetchzip {
url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%20${minimalJavaVersion}%20and%20higher%29/${version}/${pname}_${version}_src.tar.gz";
hash = "sha256-dmNfI6T0MU7UtMH+C/2hiAeDwZlFCB4JofQViZezoqI=";
};
nativeBuildInputs = [ ant jdk makeWrapper ];
buildPhase = ''
runHook preBuild
ant runtime-linux -Dnewsplugin.url=file://${newsPlugin}
ant tvbrowser-desktop-entry
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/${pname}
cp -R runtime/tvbrowser_linux/* $out/share/${pname}
mkdir -p $out/share/applications
mv -t $out/share/applications $out/share/${pname}/${pname}.desktop
sed -e 's|=imgs/|='$out'/share/${pname}/imgs/|' \
-e 's|=${pname}.sh|='$out'/bin/${pname}|' \
-i $out/share/applications/${pname}.desktop
for i in 16 32 48 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
ln -s $out/share/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
done
mkdir -p $out/bin
makeWrapper \
$out/share/${pname}/${pname}.sh \
$out/bin/${pname} \
--prefix PATH : ${jdk}/bin \
--prefix XDG_DATA_DIRS : $out/share \
--set PROGRAM_DIR $out/share/${pname}
runHook postInstall
'';
passthru.tests.startwindow = callPackage ./test.nix {};
meta = with lib; {
description = "Electronic TV Program Guide";
downloadPage = "https://www.tvbrowser.org/index.php?id=tv-browser";
homepage = "https://www.tvbrowser.org/";
changelog = "https://www.tvbrowser.org/index.php?id=news";
sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ];
license = licenses.gpl3Plus;
mainProgram = pname;
platforms = platforms.linux;
maintainers = with maintainers; [ jfrankenau yarny ];
longDescription = ''
TV-Browser shows TV program data arranged like in printed
TV programs after downloading it from the internet.
Plugins are used to download program data
and to provide additional functionality.
'';
};
}

View file

@ -0,0 +1,40 @@
{ lib
, xvfb-run
, tvbrowser
, runCommand
, writeShellApplication
, xorg
}:
let
testScript = writeShellApplication {
name = "tvbrowser-test-script";
runtimeInputs = [ xorg.xwininfo tvbrowser ];
text = ''
function find_tvbrowser_windows {
for window_name in java tvbrowser-TVBrowser 'Setup assistant' ; do
grep -q "$window_name" "$1" || return 1
done
}
tvbrowser &
for _ in {0..900} ; do
xwininfo -root -tree \
| sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \
| tee window-names
echo
if find_tvbrowser_windows window-names ; then
break
fi
sleep 1
done
find_tvbrowser_windows window-names
'';
};
in
runCommand
"tvbrowser-test"
{ buildInputs = [ xvfb-run ]; }
''
HOME=$PWD xvfb-run ${lib.getExe testScript}
touch ${placeholder "out"}
''

View file

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "argocd";
version = "2.5.9";
version = "2.5.10";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI=";
sha256 = "sha256-5UzDfOPuDM5ADsXFwWa9aDM32I5s/TKg4r7idH/X3AQ=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-F5EY1/WWRPBN5fqp2J2mdpIzL1gNKR0ltzSdarT6dFw=";
vendorHash = "sha256-rkgwfSmUmxmCxbS/0r5sU+XJTGZ6NTZ+VIXpBElT0uA=";
# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

View file

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:
buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck;
inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck;
pname = "docker-machine-hyperkit";

View file

@ -1,7 +1,7 @@
{ lib, buildGoModule, minikube }:
buildGoModule rec {
inherit (minikube) version src nativeBuildInputs buildInputs vendorSha256 doCheck;
inherit (minikube) version src nativeBuildInputs buildInputs vendorHash doCheck;
pname = "docker-machine-kvm2";

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "istioctl";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "istio";
repo = "istio";
rev = version;
sha256 = "sha256-IYmNmrUdlp0V+gsAwivkF73VcBBMDcA5QWSnJ+6qKks=";
sha256 = "sha256-Qvpg6qLrtnnMrRWFHv7J+drM75V6DaMu1jxcxaCJ4kk=";
};
vendorSha256 = "sha256-yCdCuwiAAdyeLtu4zE7d8RLbqM6FuH9sw0EqDZohQxg=";
vendorHash = "sha256-wPkjRkgQiGvZm+eOGVlM5cgrYugF/E8H71bcR2ofP2U=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kyverno";
version = "1.8.5";
version = "1.9.0";
src = fetchFromGitHub {
owner = "kyverno";
repo = "kyverno";
rev = "v${version}";
sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws=";
sha256 = "sha256-i8uKhzvU9ftlzgzU4ViYg6z+OUNNHGbiFhFAwDKwtnw=";
};
ldflags = [
@ -18,7 +18,7 @@ buildGoModule rec {
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
];
vendorSha256 = "sha256-nqJZdMkpJEG6VFCTwGUzXcCZPshJnY2FYHDm3xMlU0g=";
vendorHash = "sha256-BGIh1wzHIk1kSvk/sQ/tDBhGIOOx0o6Dk4LbK9Z1FAQ=";
subPackages = [ "cmd/cli/kubectl-kyverno" ];

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation {
pname = "wdt";
version = "unstable-2022-07-08";
version = "unstable-2022-12-19";
src = fetchFromGitHub {
owner = "facebook";
repo = "wdt";
rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b";
sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0=";
rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c";
sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA=";
};
nativeBuildInputs = [ cmake ];

View file

@ -42,13 +42,13 @@
mkDerivation rec {
pname = "sdrangel";
version = "7.8.6";
version = "7.9.0";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
sha256 = "sha256-tLU2OHFf1PPNRr1t3MWWCKnvILp1DW0k4TAxrXWI2X4=";
sha256 = "sha256-lX49R1GhYH45DhxOnn3r6b4VuG8GAissCscv1Qo2GB0=";
};
nativeBuildInputs = [ cmake pkg-config ];

View file

@ -5,7 +5,7 @@
, csxcad
, qcsxcad
, hdf5
, vtk_8_withQt5
, vtkWithQt5
, qtbase
, fparser
, tinyxml
@ -15,13 +15,13 @@
mkDerivation {
pname = "appcsxcad";
version = "unstable-2020-01-04";
version = "unstable-2023-01-06";
src = fetchFromGitHub {
owner = "thliebig";
repo = "AppCSXCAD";
rev = "de8c271ec8b57e80233cb2a432e3d7fd54d30876";
sha256 = "0shnfa0if3w588a68gr82qi6k7ldg1j2921fnzji90mmay21birp";
rev = "379ede4b8e00c11e8d0fb724c35547991b30c423";
hash = "sha256-L0ZEyovnfMzM7JuITBuhb4tJ2Aqgw52IiKEfEGq7Yo0=";
};
nativeBuildInputs = [
@ -32,7 +32,7 @@ mkDerivation {
csxcad
qcsxcad
hdf5
vtk_8_withQt5
vtkWithQt5
qtbase
fparser
tinyxml

View file

@ -5,7 +5,7 @@
, tinyxml
, hdf5
, cgal_5
, vtk_8
, vtk
, boost
, gmp
, mpfr
@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "csxcad";
version = "unstable-2020-02-08";
version = "unstable-2022-05-18";
src = fetchFromGitHub {
owner = "thliebig";
repo = "CSXCAD";
rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518";
sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb";
rev = "cd9decb4d9cebe3c8bf115e2c0ee73f730f22da1";
sha256 = "1604amhvp7dm8ych7gwzxwawqvb9hpjglk5ffd4qm0y3k6r89arn";
};
patches = [./searchPath.patch ];
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
boost
gmp
mpfr
vtk_8
vtk
fparser
tinyxml
hdf5

View file

@ -5,7 +5,7 @@
, fparser
, tinyxml
, hdf5
, vtk_8
, vtk
, boost
, zlib
, cmake
@ -39,7 +39,7 @@ stdenv.mkDerivation {
fparser
tinyxml
hdf5
vtk_8
vtk
boost
zlib
csxcad

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
version = "3.1.20230127121939";
version = "3.1.20230201130431";
format = "setuptools";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-pEow2vEpQ2+c3fXkB8q7R4pud1xLzE74+HEqcBzg0D8=";
hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg=";
};
postPatch = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libunistring
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
@ -21,20 +21,23 @@
, zsh
, fish
, nixosTests
, go
, buildGoModule
}:
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.26.5";
version = "0.27.0";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4=";
hash = "sha256-742RB5ijCEYgjGgGyb6ZZ34GfMHm8253d3cNLQQzL38=";
};
vendorHash = "sha256-0hylttMwkmhpydKY7cpOoHrKmaGF4ediI8uwtcT3x4I=";
buildInputs = [
harfbuzz
@ -67,21 +70,15 @@ buildPythonApplication rec {
sphinx-copybutton
sphinxext-opengraph
sphinx-inline-tabs
go
] ++ lib.optionals stdenv.isDarwin [
imagemagick
libicns # For the png2icns tool.
];
outputs = [ "out" "terminfo" "shell_integration" ];
outputs = [ "out" "terminfo" "shell_integration" "kitten" ];
patches = [
# Fix clone-in-kitty not working on bash >= 5.2
# TODO: Removed on kitty release > 0.26.5
(fetchpatch {
url = "https://github.com/kovidgoyal/kitty/commit/51bba9110e9920afbefeb981e43d0c1728051b5e.patch";
sha256 = "sha256-1aSU4aU6j1/om0LsceGfhH1Hdzp+pPaNeWAi7U6VcP4=";
})
# Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`.
./fix-test_ssh_env_vars.patch
@ -99,7 +96,21 @@ buildPythonApplication rec {
# Causes build failure due to warning
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
dontConfigure = true;
CGO_ENABLED = 0;
GO_FLAGS = "-trimpath";
disallowedReferences = [ go ];
configurePhase = let
goModules = (buildGoModule {
pname = "kitty-go-modules";
inherit src vendorHash version;
}).go-modules;
in ''
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
export GOPROXY=off
cp -r --reflink=auto ${goModules} vendor
'';
buildPhase = let
commonOptions = ''
@ -114,17 +125,17 @@ buildPythonApplication rec {
runHook preBuild
${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" }
${if stdenv.isDarwin then ''
${python.interpreter} setup.py build ${darwinOptions}
${python.pythonForBuild.interpreter} setup.py build ${darwinOptions}
make docs
${python.interpreter} setup.py kitty.app ${darwinOptions}
${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions}
'' else ''
${python.interpreter} setup.py build-launcher
${python.interpreter} setup.py linux-package \
${python.pythonForBuild.interpreter} setup.py linux-package \
--egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \
--startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \
--canberra-library='${libcanberra}/lib/libcanberra.so' \
--fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \
${commonOptions}
${python.pythonForBuild.interpreter} setup.py build-launcher
''}
runHook postBuild
'';
@ -169,15 +180,19 @@ buildPythonApplication rec {
installPhase = ''
runHook preInstall
mkdir -p $out
mkdir -p $kitten/bin
${if stdenv.isDarwin then ''
mkdir "$out/bin"
ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten"
cp ./kitty.app/Contents/MacOS/kitten "$kitten/bin/kitten"
mkdir "$out/Applications"
cp -r kitty.app "$out/Applications/kitty.app"
installManPage 'docs/_build/man/kitty.1'
'' else ''
cp -r linux-package/{bin,share,lib} $out
cp linux-package/bin/kitten $kitten/bin/kitten
''}
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}"

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "redhat-official";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "RedHatOfficial";
repo = "RedHatFont";
rev = version;
hash = "sha256-p5RS/57CDApwnRDwMi0gIEJYTDAtibIyyU2w/pnbHJI=";
hash = "sha256-r43KtMIedNitb5Arg8fTGB3hrRZoA8oUHVEL24k4LeQ=";
};
installPhase = ''

View file

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "sarasa-gothic";
version = "0.38.0";
version = "0.39.0";
src = fetchurl {
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
hash = "sha256-UXWstk1vIoaFqa8nVxfJcAtN7BzWevzgfMx1gyXu0k8=";
hash = "sha256-n21aVsyQbZGR/dgAkYwMHB8VozTaazFVP29+p39SRKU=";
};
sourceRoot = ".";

View file

@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-11-30";
version = "2023-02-01";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
hash = "sha256-sxs2GrPuUoitZtiIU7SWFSLGXOTitS41MGt17TeuICE=";
hash = "sha256-Plm05+5r6p9MabLmmh8kWitALGFalruBbhAgBhPCjRo=";
};
nativeBuildInputs = [ gtk3 jdupes ];

View file

@ -3,14 +3,14 @@
let
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community";
version = "20230106031328";
version = "20230202101858";
src = fetchFromGitHub {
owner = "v2fly";
repo = "domain-list-community";
rev = version;
sha256 = "sha256-17yAIJQdxZAsNZ8W3HaW+EVKcPYy9fBOsSxU/0GEJuU=";
hash = "sha256-9K3Tjm1tVw5KJgT6UFcVmn/JzQidKCaQyC4EFX23QE0=";
};
vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
vendorHash = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk=";
meta = with lib; {
description = "community managed domain list";
homepage = "https://github.com/v2fly/domain-list-community";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSUserEnv, installShellFiles }:
let
@ -13,6 +13,10 @@ let
sha256 = "sha256-jew4KLpOOXE9N/h4qFqof8y26DQrvm78E/ARbbwocD4=";
};
nativeBuildInputs = [
installShellFiles
];
subPackages = [ "." ];
vendorSha256 = "sha256-BunonnjzGnpcmGJXxEQXvjJLGvdSXUOK9zAhXoAemHY=";
@ -23,6 +27,15 @@ let
"-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
postInstall = ''
export HOME="$(mktemp -d)"
for s in {bash,zsh,fish}; do
$out/bin/arduino-cli completion $s > completion.$s
installShellCompletion --cmd arduino-cli --$s completion.$s
done
unset HOME
'';
meta = with lib; {
inherit (src.meta) homepage;
description = "Arduino from the command line";
@ -46,7 +59,9 @@ if stdenv.isLinux then
extraInstallCommands = ''
mv $out/bin/$name $out/bin/arduino-cli
cp -r ${pkg.outPath}/share $out/share
'';
passthru.pureGoPkg = pkg;
targetPkgs = pkgs: with pkgs; [
zlib

View file

@ -345,6 +345,8 @@ in with passthru; stdenv.mkDerivation {
"ac_cv_computed_gotos=yes"
"ac_cv_file__dev_ptmx=yes"
"ac_cv_file__dev_ptc=yes"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
"--with-build-python=${pythonForBuildInterpreter}"
] ++ optionals stdenv.hostPlatform.isLinux [
# Never even try to use lchmod on linux,
# don't rely on detecting glibc-isms.

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ilmbase, karchive, openexr, libavif, libheif, qtbase
ilmbase, karchive, openexr, libavif, libheif, libjxl, qtbase
}:
let inherit (lib) getDev; in
@ -10,7 +10,7 @@ mkDerivation {
pname = "kimageformats";
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive openexr libavif libheif qtbase ];
buildInputs = [ karchive openexr libavif libheif libjxl qtbase ];
outputs = [ "out" ]; # plugins only
CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
cmakeFlags = [

View file

@ -49,7 +49,7 @@
, enableGtk3 ? false
, gtk3
, enableVtk ? false
, vtk_8
, vtk
, enableFfmpeg ? true
, ffmpeg
, enableGStreamer ? true
@ -273,7 +273,7 @@ stdenv.mkDerivation {
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
++ lib.optional enableVtk vtk_8
++ lib.optional enableVtk vtk
++ lib.optional enableJPEG libjpeg
++ lib.optional enablePNG libpng
++ lib.optional enableTIFF libtiff

View file

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "opendht";
version = "2.4.10";
version = "2.4.12";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "v${version}";
sha256 = "sha256-2jTphFpBsm72UDzlBlCP1fWk1qNuxicwVJtrEutOjM0=";
sha256 = "sha256-PC3Oaa1i2emkTB6ooBxvjuKVikzWjfmj89t1HP8tUXo=";
};
nativeBuildInputs = [

View file

@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
pname = "pinocchio";
version = "2.6.15";
version = "2.6.16";
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-bnm5nbb0mKw76k2J2Qi04n7bmfzadtqV/AmnWSzbb+0=";
hash = "sha256-ihyLoElqpIhsZXPF3o4XgbkzeE/BYdz8+WhLLcpc6PE=";
};
# error: use of undeclared identifier '__sincos'

View file

@ -4,19 +4,19 @@
, cmake
, csxcad
, tinyxml
, vtk_8_withQt5
, vtkWithQt5
, qtbase
}:
mkDerivation {
pname = "qcsxcad";
version = "unstable-2020-01-04";
version = "unstable-2023-01-06";
src = fetchFromGitHub {
owner = "thliebig";
repo = "QCSXCAD";
rev = "0dabbaf2bc1190adec300871cf309791af842c8e";
sha256 = "11kbh0mxbdfh7s5azqin3i2alic5ihmdfj0jwgnrhlpjk4cbf9rn";
rev = "1cde9d560a5000f4c24c249d2dd5ccda12de38b6";
hash = "sha256-kc9Vnx6jGiQC2K88ZH00b61D/DbWxAIZZwYCsINqtrY=";
};
outputs = [ "out" "dev" ];
@ -33,7 +33,7 @@ mkDerivation {
buildInputs = [
csxcad
tinyxml
vtk_8_withQt5
vtkWithQt5
qtbase
];

View file

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "brev-cli";
version = "0.6.202";
version = "0.6.204";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-H16CNJ8ztcwGDoH4dZ66/HbpNVEe+pYpKJcFpjW2wCs=";
sha256 = "sha256-MQF0mU1cpvkJ6VZE6A8J4W6DMS8RXhjLisrPkKParl4=";
};
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";

View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aiosomecomfort";
version = "0.0.6";
version = "0.0.7";
format = "setuptools";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "mkmer";
repo = "AIOSomecomfort";
rev = "refs/tags/${version}";
hash = "sha256-3p38gWCqQVYz3sgu6SgfPH+wH/ZH2Qg+tVXiARuUh7s=";
hash = "sha256-NVtoQJOC4rNny95/lFk2eJ5mycNSuZrIy1GGZKYZ1VA=";
};
propagatedBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
version = "3.2.1";
version = "3.2.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-k3xmW8aMBz6dbWuLnd6tw2BFoTuD80fpY7q2NfYqMlw=";
hash = "sha256-17LTNQjI2UfgtlNNkSRSWMNnhgokBXn/7KGuKo5Ai4E=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,70 @@
{ lib
, aiohttp
, attrs
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, pytestCheckHook
, pythonRelaxDepsHook
, pythonOlder
, structlog
}:
buildPythonPackage rec {
pname = "arsenic";
version = "21.8";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "HENNGE";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-fsLo22PR9WdX2FazPgr8B8dFq6EM1LLTpRFGEm/ymCE=";
};
patches = [
# Switch to poetry-core, https://github.com/HENNGE/arsenic/pull/160
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/HENNGE/arsenic/commit/ca82894a5f1e832ab9283a245258b334bdd48855.patch";
hash = "sha256-ECCUaJF4MRmFOKH1C6HowJ+zmbEPPiS7h9DlKw5otZc=";
})
];
pythonRelaxDeps = [
"structlog"
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
aiohttp
attrs
structlog
];
nativeCheckInputs = [
pytestCheckHook
];
# Depends on asyncio_extras which is not longer maintained
doCheck = false;
pythonImportsCheck = [
"arsenic"
];
meta = with lib; {
description = "WebDriver implementation for asyncio and asyncio-compatible frameworks";
homepage = "https://github.com/HENNGE/arsenic/";
changelog = "https://github.com/HENNGE/arsenic/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View file

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "elementpath";
version = "3.0.2";
version = "4.0.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "refs/tags/v${version}";
hash = "sha256-b+Th28GI2UOmfO4jy4biohAJWPiYWkvFLqqs9lgR4Vc=";
hash = "sha256-BEnSPRuQUnKXtPAJfjxS+fwE0rpPj1U2yRK8eImKMYw=";
};
# avoid circular dependency with xmlschema which directly depends on this
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
homepage = "https://github.com/sissaschool/elementpath";
changelog = "https://github.com/sissaschool/elementpath/blob/${version}/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};

View file

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "fastapi-mail";
version = "1.2.4";
version = "1.2.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "sabuhish";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-6Iwgl15adc6wK7i8sFLeSf2HSvMo/Sx/BI44qboNnRM=";
hash = "sha256-SogtdLTiTCJ8qUYsnwhPgBLFbj66EJC7L4wS64Nmuoo=";
};
postPatch = ''

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ghrepo-stats";
version = "0.5.1";
version = "0.5.2";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "mrbean-bremen";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QHFwIfX0rSVnWgxe82zQXMwIS99CiPgprfoMbuXvXH0=";
hash = "sha256-YKGVDE1cM3Lcr9lHE2iserleob0BE3DxchdSX65CJBE=";
};
postPatch = ''

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2023.2.1";
version = "2023.2.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-kTWUwHgcq+J3ok43gpXmsxmKTnrjPMzmowSkm404j4Q=";
sha256 = "sha256-JYoTX83N70ARI9CvoUujRPI6hUVkIC1Ma/D/hjtLTes=";
};
nativeBuildInputs = [

View file

@ -3,7 +3,6 @@
, pythonOlder
, fetchFromGitHub
, fetchPypi
, fetchpatch
, setuptools
, setuptools-scm
, requests
@ -39,14 +38,10 @@ buildPythonPackage rec {
hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E=";
};
patches = [
postPatch = ''
# https://github.com/jaraco/jaraco.abode/issues/19
(fetchpatch {
name = "specify-options-package-data.patch";
url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch";
hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk=";
})
];
echo "graft jaraco" > MANIFEST.in
'';
nativeBuildInputs = [
setuptools

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "oralb-ble";
version = "0.17.1";
version = "0.17.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0VZRtsh17W8h1qcGfAxE4KUehtCk1PKy3MO3fVJb4qY=";
hash = "sha256-v2c1FoLgG6HH02d+YBr4Qh12ztRsiwWyueUNOBpWqPM=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.28.0";
version = "5.29.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-7lO3GbVPG70u+PzS/22d6i6xIRXiTMc/iUXrZurD2LU=";
hash = "sha256-sdefoQgZ58re2VtIvNQjbjAb9aateZlGSeTAiVO6JGo=";
};
sourceRoot = "${src.name}/sdk/python";

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pylutron-caseta";
version = "0.18.0";
version = "0.18.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "gurumitts";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-7bQgMDmvEAvnEoHZxZ9JzYsx1JR9W5eYuvcVUmYM/dw=";
hash = "sha256-O4PNlL3lPSIyFw9MtPP678ggLBQRPedbZn1gWys7DPQ=";
};
nativeBuildInputs = [

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.3.2";
version = "0.3.4";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-lLq+tmsyySpTO99ecH/uGK9b7/BJFbz5U2fSO/IrPGo=";
hash = "sha256-Z1dhaGMbbg4xflJGcC6cZKCvTfB8+jDbgShMzI6T/xk=";
};
postPatch = ''

View file

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
version = "0.4.7";
version = "0.4.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
hash = "sha256-1cTGzZ/5YgaYpSdk8nGLqgpKBNyY16fCFmrUJ+QwSDM=";
hash = "sha256-dEEo1KHtxj+xcp/2plIP2+c2jf5nFDg/mEq05T2Tpj0=";
};
propagatedBuildInputs = [

View file

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "sfrbox-api";
version = "0.0.5";
version = "0.0.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "hacf-fr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw=";
hash = "sha256-1Jn785e4aLd83EHjkgB90sWi9No8wqCjUEn4ecyVl4o=";
};
postPatch = ''

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "5.0.0";
version = "5.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-vcjF7o5rU8R2e75yB1LO24r5HbRq2W5RHt0Pt0lkrF0=";
hash = "sha256-8tkdjj2qTzhUA8bNu2s49UgrLegrboNKMAs2NSOA5o4=";
};
propagatedBuildInputs = [
@ -31,6 +31,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Stripe Python bindings";
homepage = "https://github.com/stripe/stripe-python";
changelog = "https://github.com/stripe/stripe-python/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ];
};

View file

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "wand";
version = "0.6.10";
version = "0.6.11";
src = fetchPypi {
pname = "Wand";
inherit version;
sha256 = "sha256-Nz9KfyhmyGjDHOkQ4fmzapLRMmQKIAaOwXzqMoT+3Fc=";
sha256 = "sha256-tmFwDan48ekx5Scm5PxkOlZblRT1iD1Bt3Pjw3yfqZU=";
};
postPatch = ''
@ -38,9 +38,10 @@ buildPythonPackage rec {
passthru.imagemagick = imagemagickBig;
meta = with lib; {
changelog = "https://docs.wand-py.org/en/${version}/changes.html";
description = "Ctypes-based simple MagickWand API binding for Python";
homepage = "http://wand-py.org/";
license = [ licenses.mit ];
maintainers = with maintainers; [ infinisil ];
maintainers = with maintainers; [ infinisil dotlambda ];
};
}

View file

@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "devbox";
version = "0.2.4";
version = "0.3.2";
src = fetchFromGitHub {
owner = "jetpack-io";
repo = pname;
rev = version;
hash = "sha256-b3vBwWya5xj/y5/32KIHtvPRT6JdMpO/IKO4sVAg4AA=";
hash = "sha256-RYuSreMdXnWJ47lBCuz7Ub6jlLlmEI6ZGt3vSg4B3zs=";
};
ldflags = [

View file

@ -16,7 +16,7 @@
let
pname = "dump_syms";
version = "2.1.1";
version = "2.2.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -25,10 +25,10 @@ rustPlatform.buildRustPackage {
owner = "mozilla";
repo = pname;
rev = "v${version}";
hash = "sha256-XK//loEbKqE7DMxC9uzr+916i9E9wGHKl2MRtt1rNEg=";
hash = "sha256-rbpZXLtBPD77jZ+P6ljtrSfKYfhMUdsP/Eoi0cYxsqo=";
};
cargoSha256 = "sha256-2We/JKU1U5q5jzl9rVoDmuGYIPbo5ylMl2O4s3PClVE=";
cargoSha256 = "sha256-UUyoiyA9ykUnFavsAqo7gNMSYpQ9Lu29t4fn1oLj6gs=";
nativeBuildInputs = [
pkg-config

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.23272";
version = "0.1.23334";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Yj7bIVVCG2q6Q2ij+rH3AAC4xW7Drz+pmdIM2ToPJX4=";
sha256 = "sha256-1+PcjameB9/1MoyM0RAxrhuE649INyLlhgxA5xJQ9Pw=";
};
vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY=";
vendorHash = "sha256-E24b8PUA1Hy+OepQe2n6TecCMKKicdr5KUdiJ663Td0=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pulumictl";
version = "0.0.41";
version = "0.0.42";
src = fetchFromGitHub {
owner = "pulumi";
repo = "pulumictl";
rev = "v${version}";
sha256 = "sha256-6QBE6+wJ9MQXey9nXaJn69uVUhIVlWMdH9ROiMi7bZk=";
sha256 = "sha256-fs+etB/tzqzV3QbQKa4xqsAjtUkr1BdKtTNvRylnKaY=";
};
vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk=";

View file

@ -9,13 +9,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "sentry-cli";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-cli";
rev = version;
sha256 = "sha256-08H/aNYUsTORCwTm9pwWiLQjAcWSiZrjg5q6OkkllWg=";
sha256 = "sha256-HkaCaOVbEEy8H6gN9hoiDEEQM+XWyUJ4gYPxTlbBGgA=";
};
doCheck = false;
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "sha256-GEZZXRPfpIhr73SpyP9iLSjRe67wllSpp5oh6N0S9ok=";
cargoHash = "sha256-4RUeUwixb5omcHT4jJHJKF2lYZE/4014DnrR2j7sen0=";
meta = with lib; {
homepage = "https://docs.sentry.io/cli/";

View file

@ -5,9 +5,15 @@
, cmake
, gtest
, spdlog
, libxml2
, libffi
, Foundation
}:
llvmPackages.stdenv.mkDerivation rec {
let
stdenv = llvmPackages.stdenv;
in
stdenv.mkDerivation rec {
pname = "wasmedge";
version = "0.11.2";
@ -18,19 +24,26 @@ llvmPackages.stdenv.mkDerivation rec {
sha256 = "sha256-P2Y2WK6G8aEK1Q4hjrS9X+2WbOfy4brclB/+SWP5LTM=";
};
nativeBuildInputs = [
cmake
llvmPackages.lld
];
buildInputs = [
boost
spdlog
llvmPackages.llvm
libxml2
libffi
] ++ lib.optionals stdenv.isDarwin [
Foundation
];
nativeBuildInputs = [ cmake llvmPackages.lld ];
nativeCheckInputs = [ gtest ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git
] ++ lib.optionals stdenv.isDarwin [
"-DWASMEDGE_FORCE_DISABLE_LTO=ON"
];
meta = with lib; {
@ -38,5 +51,7 @@ llvmPackages.stdenv.mkDerivation rec {
license = with licenses; [ asl20 ];
description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications";
maintainers = with maintainers; [ dit7ya ];
# error: no member named 'utimensat' in the global namespace
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

View file

@ -28,43 +28,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake copyDesktopItems pkg-config ];
buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];
desktopItems = [
(makeDesktopItem {
name = "ecwolf";
exec = "ecwolf";
comment = "Enhanced Wolfenstein 3D port";
desktopName = "Wolfenstein 3D";
categories = [ "Game" ];
})
];
# Change the location where the ecwolf executable looks for the ecwolf.pk3
# file.
#
# By default, it expects the PK3 file to reside in the same directory as the
# executable, which is not desirable.
# We will adjust the code so that it can be retrieved from the share/
# directory.
preConfigure = ''
sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h
''
# Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store
+ lib.optionalString stdenv.isDarwin ''
preConfigure = lib.optionalString stdenv.isDarwin ''
sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt
'';
# Install the required PK3 file in the required data directory
# ECWolf installs its binary to the games/ directory, but Nix only adds bin/
# directories to the PATH.
postInstall = ''
mkdir -p $out/share/ecwolf
cp ecwolf.pk3 $out/share/ecwolf
mv "$out/games" "$out/bin"
'';
meta = with lib; {
description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms";
homepage = "https://maniacsvault.net/ecwolf/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ sander ];
maintainers = with maintainers; [ jayman2000 sander ];
platforms = platforms.all;
# On Darwin, the linker fails to find a bunch of symbols.
broken = stdenv.isDarwin;

View file

@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "headscale";
version = "0.19.0";
version = "0.20.0";
src = fetchFromGitHub {
owner = "juanfont";
repo = "headscale";
rev = "v${version}";
hash = "sha256-/KT3JZ/xYcKRynksWgsPsioCLTSxeQxr6WjRUzYXJcU=";
hash = "sha256-RqJrqY1Eh5/TY+vMAO5fABmeV5aSzcLD4fX7j1QDN6w=";
};
vendorHash = "sha256-8p5NFxXKaZPsW4B6NMzfi0pqfVroIahSgA0fukvB3JI=";

View file

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "evcc";
version = "0.112.1";
version = "0.112.2";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-Y/Py7WTv8tiPdbPswpVhqpBW5l2XJB7T3KDm+xWfl8s=";
hash = "sha256-rIsx1c9Pz7nAjJe71YYmizhDkrIR1gcCocmTUMdkt5A=";
};
vendorHash = "sha256-sfASvLsNUp+7T0ib87HkLNBDp5fbk3hEV0LIKK46O4g=";

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, libevent, libiconv, openssl, pcre, zlib
, odbcSupport ? true, unixODBC
, snmpSupport ? true, net-snmp
, snmpSupport ? stdenv.buildPlatform == stdenv.hostPlatform, net-snmp
, sshSupport ? true, libssh2
, sqliteSupport ? false, sqlite
, mysqlSupport ? false, libmysqlclient
@ -60,6 +60,11 @@ in
find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +
'';
makeFlags = [
"AR:=$(AR)"
"RANLIB:=$(RANLIB)"
];
postInstall = ''
mkdir -p $out/share/zabbix/database/
'' + optionalString sqliteSupport ''

View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "nats-server";
version = "2.9.11";
version = "2.9.12";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
hash = "sha256-iYiQYGwvxW7GF32h+E1vg3x6sml7zGk40jbY8akmOnM=";
hash = "sha256-IhzbtTH8Vr+Z1Z9Xzz/CbmxDaR6ygdebEqz2ELa4N3E=";
};
vendorHash = "sha256-qApohNp//N/eBljpa+D2fR19rqw8Bd8wdmME9fzqDxc=";
vendorHash = "sha256-tUqUB9M7doUmYRAKmzos93PCizGlHe61rpMVe0z3hVo=";
doCheck = false;

View file

@ -26,16 +26,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.74.0";
version = "0.75.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-KFCsZmD83FqnB553Tbub95I7s8QGBMZ3rviKAQNcKqA=";
sha256 = "sha256-u8/SvuR/RpJaBX4Dr3Onrk0AVpIAeVb+399+NUpgkfI=";
};
cargoSha256 = "sha256-DpPyvNr1gh7w9HesmkH6N3ZGOmoZx/BDOQ0fQk84bE8=";
cargoSha256 = "sha256-hnSumfZd9ylEx3dkTGW2s4VSv107MHOn21ytOcimhPw=";
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];

View file

@ -399,10 +399,8 @@ else let
# See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamily = platform: with platform;
/**/ if isAarch32 then "arm"
else if isAarch64 then "aarch64"
else if isx86_32 then "x86"
else if isx86_64 then "x86_64"
else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits;
else platform.uname.processor;
crossFile = builtins.toFile "cross-file.conf" ''
[properties]

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "xosview";
version = "1.23";
version = "1.24";
src = fetchFromGitHub {
owner = "hills";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-CoBVFTCpvZkIe/g+17JNV1y0G9K+t+p3EE9C5kuBe2k=";
hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw=";
};
dontConfigure = true;

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
version = "0.20.3";
version = "0.20.4";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
sha256 = "sha256-8ssYzsjXwYH3xVFxtk8zYcJnrc+wKuoV1js0ONRKBGQ=";
sha256 = "sha256-PmfyULkB93PvouOWp96F4YXyNFQqRmoy6LpOFGz0EZk=";
};
cargoHash = "sha256-eg5EXvpwIlza7mXc5MFTpaFLQSR2z/7GSPGyBgzzOj4=";
cargoHash = "sha256-L5/qOnyxfj3KfcZDI9Xp2IgE33P8yzQjVg6+4jmGQyM=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -10,19 +10,26 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "8.2.1";
version = "8.2.2";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "sha256-NlaQhQtGQzOaTD18NMiicQOrovRuTCUq54vxu34JqIU=";
rev = "refs/tags/${version}";
hash = "sha256-9mtXtBq08lL6qQg1Pq1WNwbkG0yi99mCpxNuBvr14ms=";
};
cargoSha256 = "sha256-I9OyH02JNdNgGK3918XwS5wt+11VppCTqzo50LuhnvI=";
cargoHash = "sha256-pKNqO43aFXZ/cbjNWt3tmBBbSTSKqVF7biNCPI1flvI=";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
nativeBuildInputs = [
installShellFiles
perl
];
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
Security
];
postInstall = ''
installManPage ${pname}.1
@ -31,6 +38,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "The fastest and cross-platform subdomain enumerator";
homepage = "https://github.com/Edu4rdSHL/findomain";
changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ Br1ght0ne ];
};

View file

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden";
version = "2022.12.0";
version = "2023.1.1";
src = fetchurl {
url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb";
sha256 = "sha256-deQG1GEYmnQmO5+jASsiQmDphb+4Jyq9aSn/A4z++uE=";
sha256 = "sha256-bL3ybErpY5jeCixF8qtU/DQ35xU+43K9aXreHsoCF7Q=";
};
desktopItem = makeDesktopItem {

View file

@ -1,25 +1,37 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitLab
, pkg-config
, nettle
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "sequoia-chameleon-gnupg";
version = "0.1.1";
version = "0.2.0";
src = fetchFromGitLab {
owner = "sequoia-pgp";
repo = pname;
rev = "v${version}";
hash = "sha256-liQNz833/3hi3eMi+/iEZ8fT9FFi+MrDIYbQD+dQ/p0=";
hash = "sha256-8aKT39gq6o7dnbhKbDxewd4R2e2IsbYU8vaDwYemes8=";
};
cargoHash = "sha256-bnScLSI94obYQH5YzoHY4DtGScKc4m24+SIg1d2kAKw=";
cargoHash = "sha256-Z6cXCHLrK+BcIeVCKH2l8n9SivZsZPhXGhaMObn6rjo=";
nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ];
buildInputs = [ nettle ];
nativeBuildInputs = [
rustPlatform.bindgenHook
pkg-config
];
buildInputs = [
nettle
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# gpgconf: error creating socket directory
doCheck = false;

View file

@ -5,19 +5,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "wapiti";
version = "3.1.3";
version = "3.1.6";
format = "setuptools";
src = fetchFromGitHub {
owner = "wapiti-scanner";
repo = pname;
rev = version;
sha256 = "sha256-alrJVe4Miarkk8BziC8Y333b3swJ4b4oQpP2WAdT2rc=";
rev = "refs/tags/${version}";
hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc=";
};
propagatedBuildInputs = with python3.pkgs; [
aiocache
aiosqlite
arsenic
beautifulsoup4
brotli
browser-cookie3
@ -63,15 +64,15 @@ python3.pkgs.buildPythonApplication rec {
"test_bad_separator_used"
"test_blind"
"test_chunked_timeout"
"test_cookies"
"test_drop_cookies"
"test_save_and_restore_state"
"test_explorer_extract_links"
"test_cookies_detection"
"test_cookies"
"test_csrf_cases"
"test_detection"
"test_direct"
"test_dom_detection"
"test_drop_cookies"
"test_escape_with_style"
"test_explorer_extract_links"
"test_explorer_filtering"
"test_false"
"test_frame"
@ -79,21 +80,21 @@ python3.pkgs.buildPythonApplication rec {
"test_html_detection"
"test_implies_detection"
"test_inclusion_detection"
"test_merge_with_and_without_redirection"
"test_meta_detection"
"test_multi_detection"
"test_no_crash"
"test_options"
"test_out_of_band"
"test_multi_detection"
"test_vulnerabilities"
"test_partial_tag_name_escape"
"test_prefix_and_suffix_detection"
"test_qs_limit"
"test_rare_tag_and_event"
"test_redirect_detection"
"test_request_object"
"test_save_and_restore_state"
"test_script"
"test_ssrf"
"test_merge_with_and_without_redirection"
"test_tag_name_escape"
"test_timeout"
"test_title_false_positive"
@ -102,6 +103,7 @@ python3.pkgs.buildPythonApplication rec {
"test_unregistered_cname"
"test_url_detection"
"test_verify_dns"
"test_vulnerabilities"
"test_warning"
"test_whole"
"test_xss_inside_tag_input"
@ -111,9 +113,12 @@ python3.pkgs.buildPythonApplication rec {
"test_xss_with_weak_csp"
"test_xxe"
# Requires a PHP installation
"test_timesql"
"test_cookies"
"test_loknop_lfi_to_rce"
"test_redirect"
"test_timesql"
"test_xss_inside_href_link"
"test_xss_inside_src_iframe"
# TypeError: Expected bytes or bytes-like object got: <class 'str'>
"test_persister_upload"
];
@ -138,6 +143,7 @@ python3.pkgs.buildPythonApplication rec {
if a script is vulnerable.
'';
homepage = "https://wapiti-scanner.github.io/";
changelog = "https://github.com/wapiti-scanner/wapiti/blob/${version}/doc/ChangeLog_Wapiti";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
};

View file

@ -1056,6 +1056,7 @@ mapAliases ({
nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31
nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04
nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04
nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22
nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
@ -1548,6 +1549,7 @@ mapAliases ({
truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22
tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07
turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08
tvbrowser-bin = throw "tvbrowser-bin was removed because it is now built from sources; use 'tvbrowser' instead"; # Added 2023-02-04
twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26
tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11
@ -1680,6 +1682,7 @@ mapAliases ({
yacc = bison; # moved from top-level 2021-03-14
yafaray-core = libyafaray; # Added 2022-09-23
yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04
yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15
youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";

View file

@ -9202,9 +9202,6 @@ with pkgs;
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false;
};
nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix {
openssl = openssl_1_1;
};
nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { };
nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix {
enableNpm = false;
@ -13078,6 +13075,7 @@ with pkgs;
wasmedge = callPackage ../development/tools/wasmedge {
llvmPackages = llvmPackages_12;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
welkin = callPackage ../tools/graphics/welkin {};
@ -13595,10 +13593,6 @@ with pkgs;
yarn = callPackage ../development/tools/yarn { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
pkgs = pkgs.__splicedPackages;
nodejs = nodejs.override { openssl = openssl_1_1; };
};
inherit (yarn2nix-moretea)
yarn2nix
@ -28724,6 +28718,8 @@ with pkgs;
plugins = [];
};
denaro = callPackage ../applications/finance/denaro { };
dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
dht = callPackage ../applications/networking/p2p/dht { };
@ -38230,7 +38226,7 @@ with pkgs;
trufflehog = callPackage ../tools/security/trufflehog { };
tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { };
tvbrowser = callPackage ../applications/misc/tvbrowser { };
tvheadend = callPackage ../servers/tvheadend {
dtv-scan-tables = dtv-scan-tables_tvheadend;

View file

@ -19469,10 +19469,10 @@ let
PerlMagick = ImageMagick; # added 2021-08-02
ImageMagick = buildPerlPackage rec {
pname = "Image-Magick";
version = "7.0.11-1";
version = "7.1.0-0";
src = fetchurl {
url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz";
hash = "sha256-c0vuFmVq9bypQABBnZElGIQrpkYKwtD/B+PloBAycuI=";
hash = "sha256-+QyXXL4hRFd3xA0ZwXt/eQI9MGTvj6vPNIz4JlS8Fus=";
};
buildInputs = [ pkgs.imagemagick ];
preConfigure =

View file

@ -604,6 +604,8 @@ self: super: with self; {
arrow = callPackage ../development/python-modules/arrow { };
arsenic = callPackage ../development/python-modules/arsenic { };
arviz = callPackage ../development/python-modules/arviz { };
arxiv2bib = callPackage ../development/python-modules/arxiv2bib { };