nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-08-12 18:01:19 +00:00 committed by GitHub
commit 424166fe83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 510 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -1203,6 +1203,12 @@
githubId = 20933385;
name = "Anton Latukha";
};
antonmosich = {
email = "anton@mosich.at";
github = "antonmosich";
githubId = 27223336;
name = "Anton Mosich";
};
antono = {
email = "self@antono.info";
github = "antono";

6
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
View File

@ -30,12 +30,6 @@
enable = true;
};
# Theme calamares with GNOME theme
qt = {
enable = true;
platformTheme = "gnome";
};
# Fix scaling for calamares on wayland
environment.variables = {
QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";

32
nixos/modules/programs/captive-browser.nix
View File

@ -7,6 +7,8 @@ let
concatStringsSep escapeShellArgs optionalString
literalExpression mkEnableOption mkIf mkOption mkOptionDefault types;
requiresSetcapWrapper = config.boot.kernelPackages.kernelOlder "5.7" && cfg.bindInterface;
browserDefault = chromium: concatStringsSep " " [
''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
''${chromium}/bin/chromium''
@ -23,11 +25,23 @@ let
desktopItem = pkgs.makeDesktopItem {
name = "captive-browser";
desktopName = "Captive Portal Browser";
exec = "/run/wrappers/bin/captive-browser";
exec = "captive-browser";
icon = "nix-snowflake";
categories = [ "Network" ];
};
captive-browser-configured = pkgs.writeShellScriptBin "captive-browser" ''
export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
browser = """${cfg.browser}"""
dhcp-dns = """${cfg.dhcp-dns}"""
socks5-addr = """${cfg.socks5-addr}"""
${optionalString cfg.bindInterface ''
bind-device = """${cfg.interface}"""
''}
''}
exec ${cfg.package}/bin/captive-browser
'';
in
{
###### interface
@ -101,6 +115,7 @@ in
(pkgs.runCommand "captive-browser-desktop-item" { } ''
install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
'')
captive-browser-configured
];
programs.captive-browser.dhcp-dns =
@ -131,22 +146,11 @@ in
source = "${pkgs.busybox}/bin/udhcpc";
};
security.wrappers.captive-browser = {
security.wrappers.captive-browser = mkIf requiresSetcapWrapper {
owner = "root";
group = "root";
capabilities = "cap_net_raw+p";
source = pkgs.writeShellScript "captive-browser" ''
export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
browser = """${cfg.browser}"""
dhcp-dns = """${cfg.dhcp-dns}"""
socks5-addr = """${cfg.socks5-addr}"""
${optionalString cfg.bindInterface ''
bind-device = """${cfg.interface}"""
''}
''}
exec ${cfg.package}/bin/captive-browser
'';
source = "${captive-browser-configured}/bin/captive-browser";
};
};
}

182
pkgs/applications/editors/vim/plugins/generated.nix
View File

@ -29,12 +29,12 @@ final: prev:
ChatGPT-nvim = buildVimPluginFrom2Nix {
pname = "ChatGPT.nvim";
version = "2023-08-06";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "jackMort";
repo = "ChatGPT.nvim";
rev = "2107f7037c775bf0b9bff9015eed68929fcf493e";
sha256 = "0djhynyrnrwvfhzr35vbp4gd17aaw0g2n4zsw0s7yazjyic3xsl3";
rev = "346ebaba1c537f030505c9e5d92f48c88ee235b4";
sha256 = "03v7ibqyfbsn6p7sdqjsi79aq2n87q92cx665g849a8s349dglai";
};
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
};
@ -305,12 +305,12 @@ final: prev:
SchemaStore-nvim = buildVimPluginFrom2Nix {
pname = "SchemaStore.nvim";
version = "2023-08-09";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
rev = "129914a81535b2c7296c05587c07ac8876fbd3e6";
sha256 = "1hgvhdzjcknapixh960giy8hjwsz47fsmv21k29dg8gaab5k75ja";
rev = "6a36e79d9d1c2649063128e407c33e257cf85baf";
sha256 = "0kz3p1cjk55iqxyns2znqjpdw97qsz6rbrvwn40nyypdca23zm8h";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@ -502,8 +502,8 @@ final: prev:
src = fetchFromGitHub {
owner = "stevearc";
repo = "aerial.nvim";
rev = "bd31dd0ebe8fb46c452cc7dcd514687112d4d02e";
sha256 = "0hpkz1kkv02y4c3bb45bs3jap7smsiprrm4vybwh00yhs82dpwfg";
rev = "bb2cc2fbf0f5be6ff6cd7e467c7c6b02860f3c7b";
sha256 = "0igkkyw8wyh3qi18is83szpay0088xfawk4050cww8kp3rxv1fld";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -1147,12 +1147,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
version = "2023-07-24";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
rev = "99f0932365b34e22549ff58e1bea388465d15e99";
sha256 = "17cs0kbgavjsnwjp7n3xbznba0zfpz5g6wgxa6d30070w9hjq91j";
rev = "417b303328118b6d836ae330142e88771c48a8a3";
sha256 = "0cylncv3z34z76178whji62nsvrs55n8xrmz8bymdc0nlvkx7j4f";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@ -1231,12 +1231,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2023-08-08";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "0805b8630b24f028f28151c04c1d8291adf4bdb0";
sha256 = "16jzq1rh86cd6cwkgxvfj500msmlmld0zkxkiq5pmbmcawbkhmz6";
rev = "7dbc8b17c6d22a7511a8818636a8f7a428cf56f8";
sha256 = "1vqw7g4kqjrcjfqzq4r995lh0yc466pa88d24ii38vwzmzp27z10";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -2251,12 +2251,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
version = "2023-07-11";
version = "2023-08-04";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
rev = "2482871cbe0d1b85d331465cf7f065d5d2a7e2ac";
sha256 = "1jmlpf0k9zf6djblpphxlwsg6l0nhfxni67z8gzmawxg8a300kgg";
rev = "0d9b823db06cc11e6115b54297f690dff10c0299";
sha256 = "0s7pf2jq1rfyxwina555702ln52h4x9gjnfk2sjpdgk7515bk9s5";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@ -2299,12 +2299,12 @@ final: prev:
copilot-lua = buildVimPluginFrom2Nix {
pname = "copilot.lua";
version = "2023-08-04";
version = "2023-08-10";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot.lua";
rev = "f306957de0f9730de4298bb1ea85c3735ef7cc43";
sha256 = "1v76k17wk4wri7gnf9fhaail2wjgsgipmjcqab5kkiavllngn24l";
rev = "50ca36fd766db4d444094de81f5e131b6628f48f";
sha256 = "1hmrz9vgnsjc27w58pk9ar06f7wzsc0f325rdj2sxhrg8v3kc1gl";
};
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
};
@ -2359,12 +2359,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-08-06";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "3d202065fd34701618e049a6bdcf8634121877c6";
sha256 = "112kwh4cyics8srgi2n4axwxb12278acish3v5dyfp97b0wcv7ar";
rev = "64f4d9346b48566ecb910d2299a6fe9e156346f9";
sha256 = "02yy75arzd0skhr69vvlwpawr2wznk729g5pznn6k2iymh4g2kkj";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@ -4150,12 +4150,12 @@ final: prev:
hotpot-nvim = buildVimPluginFrom2Nix {
pname = "hotpot.nvim";
version = "2023-08-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "hotpot.nvim";
rev = "34050bff81bea0d8f90a6389b31d1399603c4ae4";
sha256 = "0bvk9pk594xpm3gmq57dv7i9ms872smd4bm7hj6m3s31b65dqjdq";
rev = "42cb3f364a7ac6c2dfca08c8b86f950b00097657";
sha256 = "0y1049gmg6ia594ms00hx485d06cjmj9g65wgqnmziyjkssvbjan";
};
meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
};
@ -4631,12 +4631,12 @@ final: prev:
lazy-lsp-nvim = buildVimPluginFrom2Nix {
pname = "lazy-lsp.nvim";
version = "2023-07-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "dundalek";
repo = "lazy-lsp.nvim";
rev = "c35cb31854f87aece550404103d6ca921b2689aa";
sha256 = "0ilcg7z7f02y8a319ajsdi8vyvm3aby6hihxzaa06r2aqn1g4dwj";
rev = "4b10237a7f9e5ab678eb384a4266e2e28e8472f7";
sha256 = "1rblszvg8g7bvqlx8f6dhr3hrs7azki2sbh60r5kk3p8884sjfyd";
};
meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
};
@ -4667,12 +4667,12 @@ final: prev:
lean-nvim = buildVimPluginFrom2Nix {
pname = "lean.nvim";
version = "2023-08-04";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
rev = "9dd3f51eed8c6d309f56c6d7c1c9e2953eb52b4b";
sha256 = "0xc3gz5kg95aani2wkk61s4a1v5vp32g447ypd3239y9zv7c36ai";
rev = "67580fab5bed73920fa3fdd712fc8e805c389c3d";
sha256 = "1wpklaiyk0hcipmrc1ampqn6x4qhag2srrb7cz22smh74bhw66cd";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@ -5122,12 +5122,12 @@ final: prev:
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga.nvim";
version = "2023-08-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "lspsaga.nvim";
rev = "e552e9d2ffc7ba99e1a2f51764b48ad4c668ada4";
sha256 = "0cb5hdskwpysmpd7iz99dc7xm0p2ywar4igllczx1l9nkcx85191";
rev = "5890d58e8cf174ea5c69e9ea8c41558b01f18897";
sha256 = "1zrzcm3jkv4s5rp012p9ymrralcafibiqnyraczx0p2rh9q16zhd";
};
meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
};
@ -5363,12 +5363,12 @@ final: prev:
melange-nvim = buildVimPluginFrom2Nix {
pname = "melange-nvim";
version = "2023-08-08";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "savq";
repo = "melange-nvim";
rev = "11f35df3e091f35e966a335ed90b0d8a03851ffd";
sha256 = "0s0pb1cgx40zcxjy7axx06ix4zl5f8i3gi86rqy2qsagzp1adbf6";
rev = "517518347e41301bb2d1189d257f3918551a2ea5";
sha256 = "0rh6bm12wkkwbhb1xfp3n57xjy9i99zc92wbzvalp8ylps9dvcpb";
};
meta.homepage = "https://github.com/savq/melange-nvim/";
};
@ -5819,12 +5819,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2023-08-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
rev = "34f5e78891a1543cb3a223052d4421e3256e8dd5";
sha256 = "1ar82rwfwgwg4scf2y4wmlj14lhsmnnzkxa6xcnpnqjvy4p8dbz2";
rev = "e80cd6424a8a85d93bac25b8cd8d1758105f2b0f";
sha256 = "1x5cp250qim36l63qgikqpygmsdcciq7i69gcs3qfx9jxfgih4fh";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
};
@ -6803,12 +6803,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
version = "2023-08-07";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
rev = "ca161dadc7699ca1d5fbbdc40ecf8ad54814d38f";
sha256 = "1cv20k3cmxzbx0fbclqkkkg75hk6myhfr9n2mg1vcnrrkmvmh6vv";
rev = "a15b1a6a060d77e5a0047ac2962b90c0d47c9903";
sha256 = "088n6ix7hz0k49ykwmpyxphw7mqs1dxdkl43ba0b9nnwbfr6ii1z";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@ -6971,12 +6971,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-08-09";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4";
sha256 = "0k7cly9xmjgpq55izxk3kcrc6289fra3pcpkisslr9jj6qzq3bfq";
rev = "a981d4447b92c54a4d464eb1a76b799bc3f9a771";
sha256 = "0bcfrz5r1d5v5iizjirfg3hfzlb415557zhvkdig3ciphbly3ccj";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -7187,12 +7187,12 @@ final: prev:
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
version = "2023-08-07";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
rev = "7fa516c1bd73c0be3e4a8e6693a249fc6e85cb83";
sha256 = "1q47w5ksz9zfjczcffkg4iqq3v5cbjplqp7g6z4cxssr9wy3pwfr";
rev = "f3991f78682fd24ad65d936d55715f4c7363016e";
sha256 = "0csf3z48zl3zbj255sd0h823ggi4y2lg6gxy8qr4j0gwrphq1qsc";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@ -7307,12 +7307,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-08-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "477a5d76a241ea5d79974072ee133dada223420d";
sha256 = "19k47cb9ra6xpwxn0yc13cxa2cfk262m73kld9rhz38f6kvy2qbi";
rev = "fa414da96f4a2e60c2ac8082f0c1802b8f3c8f6c";
sha256 = "027702lqkkn1pmwnypmwx1s8bz6lg6ix882g1rcwyrpn3lb85489";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -7486,12 +7486,12 @@ final: prev:
nvimdev-nvim = buildVimPluginFrom2Nix {
pname = "nvimdev.nvim";
version = "2023-07-20";
version = "2023-08-12";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvimdev.nvim";
rev = "07f161a0252f7ad1cf22a1ba4a567b41d9aece97";
sha256 = "086qy6zqjjnjml8msxi34zx79cvqfmnv4lgg8gz32m3gpllazvkp";
rev = "3b873456a439e572b590636a0c6ea7ccfec14776";
sha256 = "16cz6lha7zb34qdsv1xg5hz4dk9pzaqnqvwgjmnfqcmpb5jw71x1";
};
meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
};
@ -8546,12 +8546,12 @@ final: prev:
sg-nvim = buildVimPluginFrom2Nix {
pname = "sg.nvim";
version = "2023-08-08";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "sg.nvim";
rev = "6138d659f6a98ebf08d1a9206b456b792b17d52c";
sha256 = "0gf533dgin5s6rn7d0wxzz87223vlb9kd8zz6mbwya8bh7gw9966";
rev = "49f28eef7a78fb8c5fddf6fbf1c07c78035f2e03";
sha256 = "17s2r6rmzz5fkiyhnkvpvyi8w3ffp0avnp4c7s6p3pi1lqwkz9nw";
};
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
};
@ -8823,12 +8823,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin.vim";
version = "2023-08-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
rev = "30a1d7cc3b061d37ee5cac866dae4b0604b5f20a";
sha256 = "0c14d1dyijws9xwjnhqk33fkmhsq0vgfdjh7w2p0k20jvpl60inz";
rev = "0e208e01e7981d59914f045144f5dee709abf891";
sha256 = "09pp75byrqscp21sv9bvkbcfilqiqrfg7zrb8c0af6k9s7hsbz30";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@ -8872,12 +8872,12 @@ final: prev:
ssr-nvim = buildVimPluginFrom2Nix {
pname = "ssr.nvim";
version = "2023-08-09";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "cshuaimin";
repo = "ssr.nvim";
rev = "bc9c0d2dd765dafc1b8fecb28d0a317e7913b81f";
sha256 = "18hhbq1fbsab3g3n4mj09jwapzra7754hp23w6dsv4nvf8rq27qc";
rev = "027a89f84283a9051427d4f319720336535c2e82";
sha256 = "1b8nllqvi12kg1ixzipwdxnc68qr034s9r4wqnydwccdi1cw6pdd";
};
meta.homepage = "https://github.com/cshuaimin/ssr.nvim/";
};
@ -9306,12 +9306,12 @@ final: prev:
telescope-frecency-nvim = buildVimPluginFrom2Nix {
pname = "telescope-frecency.nvim";
version = "2023-08-10";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope-frecency.nvim";
rev = "509288ef3de6419bf72c43781a1fe921420cf8ac";
sha256 = "0maj0v7bvjg3ai2bv6xk5hxichvv6y0mjs2kkwpi3p309qssv435";
rev = "9b17c177447915f066cf78952892fe771c3e43c5";
sha256 = "0c9f7ahlhvky1n9wkc4vfkbiqnwf5d6b4mphcj7grrpm1imxfj8d";
};
meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
};
@ -10005,12 +10005,12 @@ final: prev:
unison = buildVimPluginFrom2Nix {
pname = "unison";
version = "2023-08-09";
version = "2023-08-10";
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "388d0b9051fc8bf2d5f96285ac2800835b0d696a";
sha256 = "1cai2vzi456djxbnq0yi1inn5n4jzwwr2qffcr21v4jl823i603k";
rev = "5966a2a591fc2b56cffbe98acec8fb67ade9c479";
sha256 = "1r8agg2v15k7q28fmpxlag5nr6spxjja2jzmpa54ksw14y58cj00";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@ -10089,12 +10089,12 @@ final: prev:
verilog_systemverilog-vim = buildVimPluginFrom2Nix {
pname = "verilog_systemverilog.vim";
version = "2023-02-20";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "vhda";
repo = "verilog_systemverilog.vim";
rev = "b47a3c0e5ace979f67326b82702b9da5acd7efb9";
sha256 = "1ig8m86pbvjqvykgi0xm45c0q3h5ibwqjmr3scpqkz2ah6wahpvb";
rev = "74e533b5f8f169af86af27d7206814103b35efcb";
sha256 = "0f9fylwhmya8rzg605bjyn8qldhyk59d6r98fhd6s4nn3n939rvw";
};
meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
};
@ -11853,12 +11853,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2023-06-22";
version = "2023-08-10";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "12de6c0bc0efce3cedc5e28d4fe0ecc3a4aaeb77";
sha256 = "0y576h385h9m7d8wic2b2743v8l4vvpcly6fk5siwziqbq2j082h";
rev = "ca29cf84515431ba74dcf9abe6d403809b513e3b";
sha256 = "13nsq9ch0jn79xnmhah3hi4v2dyaaypqgkw1x95az20apr19sv0f";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -13358,12 +13358,12 @@ final: prev:
pname = "vim-pasta";
version = "2018-09-08";
src = fetchFromGitHub {
owner = "sickill";
owner = "ku1ik";
repo = "vim-pasta";
rev = "cb4501a123d74fc7d66ac9f10b80c9d393746c66";
sha256 = "14rswwx24i75xzgkbx1hywan1msn2ki26353ly2pyvznnqss1pwq";
};
meta.homepage = "https://github.com/sickill/vim-pasta/";
meta.homepage = "https://github.com/ku1ik/vim-pasta/";
};
vim-pathogen = buildVimPluginFrom2Nix {
@ -13450,6 +13450,18 @@ final: prev:
meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/";
};
vim-pluto = buildVimPluginFrom2Nix {
pname = "vim-pluto";
version = "2022-02-01";
src = fetchFromGitHub {
owner = "hasundue";
repo = "vim-pluto";
rev = "a20df8c2e228f3db8a5cd004d1b7f275a591d4bd";
sha256 = "1ds0hwhmsc0d67xcyk9sdmp2hckkr1nlb57dnxmfgsswirpxzbbq";
};
meta.homepage = "https://github.com/hasundue/vim-pluto/";
};
vim-polyglot = buildVimPluginFrom2Nix {
pname = "vim-polyglot";
version = "2022-10-14";
@ -14377,12 +14389,12 @@ final: prev:
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
version = "2023-08-09";
version = "2023-08-11";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
rev = "7cb4ae5212451266a1f643642d47474063a99de4";
sha256 = "1xqlp1b54ssvfw7p212bmd10ccsjz77rm3vnvhs955f0blg80ji5";
rev = "837640f1cb74067aa326d533a8b4609800a55a8d";
sha256 = "16605786h5dy5w667i2zfcl96ardr1nq37hlymyd0linffqbai42";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@ -15579,12 +15591,12 @@ final: prev:
catppuccin-nvim = buildVimPluginFrom2Nix {
pname = "catppuccin-nvim";
version = "2023-08-06";
version = "2023-08-10";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
rev = "371430f32f2637d2dd5796399b3982d4cada61d8";
sha256 = "1fk1zjr9w2s41vm35d25rgb06kq5gx6j9qhq5rr1qs8kdwb9a2gs";
rev = "490078b1593c6609e6a50ad5001e7902ea601824";
sha256 = "03nwnc8q65nqjvrxj5fg8c95ywqb94xyim2hxald95agiickv6rd";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};

65
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@ -27,12 +27,12 @@
};
arduino = buildGrammar {
language = "arduino";
version = "0.0.0+rev=11d4fd1";
version = "0.0.0+rev=d988e6a";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-arduino";
rev = "11d4fd1b0320514272cfbe3aa911a3cd8705b7a9";
hash = "sha256-lbMmgY3Nriw2KxuOT3iI8h/nrVzMPG+E/NuNDLe9X9Y=";
rev = "d988e6a803203cc2bbfd2a8a84edffc73d2922b4";
hash = "sha256-Q8LmoBIKqU/DCf387ew/LgvYbyT8KsxvmD+WFMXOMGI=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
};
@ -258,12 +258,12 @@
};
cpp = buildGrammar {
language = "cpp";
version = "0.0.0+rev=869f1be";
version = "0.0.0+rev=77cecd8";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-cpp";
rev = "869f1be6ab4a384f649f4c6b374d0e4d7f0abab6";
hash = "sha256-iNUu7hO3PCiSAg2jEP5wm5MAzHDv5BT++CTJeo5lzSI=";
rev = "77cecd88d28032bf4f54fd4ee68efb53a6c8c9a5";
hash = "sha256-/w77s0qcJcLH6MX3BVuM37UQ1Xm/6t2oJ2KTq+hnIJI=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
};
@ -280,12 +280,12 @@
};
cuda = buildGrammar {
language = "cuda";
version = "0.0.0+rev=ff8425f";
version = "0.0.0+rev=d4285d0";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-cuda";
rev = "ff8425f44c1c273dd3b831913dff5cdb3fe94e25";
hash = "sha256-stfyBvEK/fQ8yFSbYnFIx1cbn0IS3Lrc5jWswRXlbVg=";
rev = "d4285d0396a409c91bcd5a7fd362cf13cc6f8600";
hash = "sha256-M4jx6pEj6kb0XIaWq7dzEvd+p6qadlowEyMYzJoeiRU=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
};
@ -645,12 +645,12 @@
};
glsl = buildGrammar {
language = "glsl";
version = "0.0.0+rev=e9c49d0";
version = "0.0.0+rev=00ffe20";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-glsl";
rev = "e9c49d0752d968bc6dcd35d0c3a88397c5d51757";
hash = "sha256-O/RNeoUZEPF8dxQDy41mQvmIyQ29V6MFr7Rgi7g4kDw=";
rev = "00ffe2099374613d2f313ace4a9dda44370b458b";
hash = "sha256-K0JSRytbV5qMP6X3rT/cmEjxdTPgT63hQpahFrUjTOU=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
};
@ -810,12 +810,12 @@
};
hlsl = buildGrammar {
language = "hlsl";
version = "0.0.0+rev=d3dc3e3";
version = "0.0.0+rev=95361dd";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "tree-sitter-hlsl";
rev = "d3dc3e3cd010d200573eee26421dbdecfd6a6b59";
hash = "sha256-mdESPOOxwJ1WEuO5No26wfvxsaiIFtQcLsE4m5OkzIQ=";
rev = "95361dde7ad4025fbec5dc4e5cdde0ea8ed64172";
hash = "sha256-zOWkB0ii0awy/P2nHd3vGEoiLpo/fswhHVvYJOwfgzg=";
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
};
@ -898,12 +898,12 @@
};
ispc = buildGrammar {
language = "ispc";
version = "0.0.0+rev=0bdbb03";
version = "0.0.0+rev=cc57a93";
src = fetchFromGitHub {
owner = "fab4100";
repo = "tree-sitter-ispc";
rev = "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7";
hash = "sha256-udsVK0FCbq6hFl0iLgWdTNbZdKps2avHk0SfJ/DIUxY=";
rev = "cc57a931eb782474324910e19ca253aa0d5fe38a";
hash = "sha256-fWBKSLzegpf5duDEqIbz5hvEFlOZFjQdLpVxLhimSAY=";
};
meta.homepage = "https://github.com/fab4100/tree-sitter-ispc";
};
@ -1275,12 +1275,12 @@
};
objc = buildGrammar {
language = "objc";
version = "0.0.0+rev=77e28ae";
version = "0.0.0+rev=97e022e";
src = fetchFromGitHub {
owner = "amaanq";
repo = "tree-sitter-objc";
rev = "77e28aeaede824a5f4aa501fb5f3138ab1019b9f";
hash = "sha256-lK0wy6cEf9RSD9G96ywkUFZrRTk1WYtkdNbI7OBGRtg=";
rev = "97e022ec4a908108283bad23d42eee39ad204db6";
hash = "sha256-3sp93zxliIrjp6Z1SUlFdp2rkcsFLba4SEIVdaQ4H+4=";
};
meta.homepage = "https://github.com/amaanq/tree-sitter-objc";
};
@ -1628,6 +1628,17 @@
};
meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego";
};
requirements = buildGrammar {
language = "requirements";
version = "0.0.0+rev=56ddb4d";
src = fetchFromGitHub {
owner = "ObserverOfTime";
repo = "tree-sitter-requirements";
rev = "56ddb4dad2ea0761d20c0995a0de2990caa350b5";
hash = "sha256-0q7cyv/a9gZG00tyBcF2i9TUcj3TqAi89CWjbzszD7U=";
};
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
};
rnoweb = buildGrammar {
language = "rnoweb";
version = "0.0.0+rev=502c112";
@ -2121,12 +2132,12 @@
};
vim = buildGrammar {
language = "vim";
version = "0.0.0+rev=26b1aea";
version = "0.0.0+rev=77e9e96";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vim";
rev = "26b1aea3b3a5dae31f784a1204205fd57f2b82b5";
hash = "sha256-NS6Ao2eK+7/NW7QufXiX2oBBLgGDLZX3PuPKezC+Quc=";
rev = "77e9e96c2ae5cff7343ce3dced263483acf95793";
hash = "sha256-YGE/up7TE1+a6FrN8iEeHbAJr6kEMcWLMPaeyQRRVLs=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vim";
};
@ -2176,12 +2187,12 @@
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=46d47ba";
version = "0.0.0+rev=f416d4b";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "46d47bade5f6ee149c9f1449f64bace22a288a2e";
hash = "sha256-wzOeJz3LM/t6e1WzNpAjeD0MNSO803YNQ3eFrHizyII=";
rev = "f416d4b76141d803ea2ebadf0629fca164133723";
hash = "sha256-xSt6C64PmNJOqZxon4TWbAIlMzSaRClPc47wi9Sxdpk=";
};
location = "libs/tree-sitter-wing";
generate = true;

6
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -947,7 +947,7 @@ self: super: {
pname = "sg-nvim-rust";
inherit (old) version src;
cargoHash = "sha256-cDlqJBx9p/rA+OAHZW2GcOiQmroU66urZ+qv2lXhg/4=";
cargoHash = "sha256-cMMNur6QKp87Q28JyCH2IMLE3xDVd7Irg9HvJ2AsnZc=";
nativeBuildInputs = [ pkg-config ];
@ -1440,6 +1440,10 @@ self: super: {
preInstall = "cd vim";
};
vim-pluto = super.vim-pluto.overrideAttrs {
dependencies = with self; [ denops-vim ];
};
vim-snipmate = super.vim-snipmate.overrideAttrs {
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
};

4
pkgs/applications/misc/librecad/default.nix
View File

@ -14,13 +14,13 @@
mkDerivation rec {
pname = "librecad";
version = "2.2.0.1";
version = "2.2.0.2";
src = fetchFromGitHub {
owner = "LibreCAD";
repo = "LibreCAD";
rev = version;
sha256 = "sha256-5tezXhkInOG+TBjEixXL/qUOHUXD9dR8vu06zl3p4Ek=";
sha256 = "sha256-Vj6nvOfmhzou2hhmujm47a7aKBzmgchDb/BbwCb3/hI=";
};
buildInputs = [

29
pkgs/applications/misc/pytrainer/default.nix
View File

@ -23,33 +23,21 @@ let
matplotlib = super.matplotlib.override {
enableGtk3 = true;
};
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
version = "1.4.46";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
});
};
in python.pkgs.buildPythonApplication rec {
pname = "pytrainer";
version = "2.1.0";
version = "2.2.1";
src = fetchFromGitHub {
owner = "pytrainer";
repo = "pytrainer";
rev = "v${version}";
sha256 = "sha256-U2SVQKkr5HF7LB0WuCZ1xc7TljISjCNO26QUDGR+W/4=";
hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
};
propagatedBuildInputs = with python.pkgs; [
sqlalchemy-migrate
sqlalchemy
python-dateutil
matplotlib
lxml
@ -85,10 +73,17 @@ in python.pkgs.buildPythonApplication rec {
psycopg2
]);
postPatch = ''
substituteInPlace pytrainer/platform.py \
--replace 'sys.prefix' "\"$out\""
'';
checkPhase = ''
env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \
env \
HOME=$TEMPDIR \
TZDIR=${tzdata}/share/zoneinfo \
TZ=Europe/Kaliningrad \
LC_ALL=en_US.UTF-8 \
LC_TIME=C \
xvfb-run -s '-screen 0 800x600x24' \
${python.interpreter} setup.py test
'';

4
pkgs/applications/networking/browsers/lagrange/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lagrange";
version = "1.16.6";
version = "1.16.7";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${finalAttrs.version}";
hash = "sha256-avBZnQi1xuyrJX7YG+8O3+122Of11innCCr5sPYyySg=";
hash = "sha256-d9QmFXDDeYDR1KFtOyQKfaYvex8TFDiYJUrKEp7H5K8=";
};
nativeBuildInputs = [ cmake pkg-config zip ];

4
pkgs/applications/networking/cluster/linkerd/default.nix
View File

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "stable";
version = "2.13.5";
sha256 = "0mjb0wcwyd51ap0kvkfmykh6zqijg4z2g5yxvp9aq67l984wh7sb";
version = "2.13.6";
sha256 = "1z5gcz1liyxydy227vb350k0hsq31x80kvxamx7l1xkd2p0mcmbj";
vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
}

4
pkgs/applications/networking/nextcloud-client/default.nix
View File

@ -25,7 +25,7 @@
mkDerivation rec {
pname = "nextcloud-client";
version = "3.9.1";
version = "3.9.2";
outputs = [ "out" "dev" ];
@ -33,7 +33,7 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
sha256 = "sha256-DQM7n7rTk1q+F8H8OpiEgg1pvIzQw2UwBObbj20O5MQ=";
sha256 = "sha256-QtZy5ccr55u8bQVBCFRNu/HJiYtNJX9BgtSV700QX0g=";
};
patches = [

12
pkgs/applications/networking/owamp/default.nix
View File

@ -3,17 +3,19 @@
stdenv.mkDerivation rec {
pname = "owamp";
version = "3.5.6";
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ mandoc ];
version = "4.4.6";
src = fetchFromGitHub {
owner = "perfsonar";
repo = "owamp";
rev = version;
sha256="019rcshmrqk8pfp510j5jvazdcnz0igfkwv44mfxb5wirzj9p6s7";
rev = "v${version}";
sha256= "5o85XSn84nOvNjIzlaZ2R6/TSHpKbWLXTO0FmqWsNMU=";
fetchSubmodules = true;
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ mandoc ];
preConfigure = ''
I2util/bootstrap.sh
./bootstrap

6
pkgs/applications/version-management/git-stack/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-stack";
version = "0.10.16";
version = "0.10.17";
src = fetchFromGitHub {
owner = "gitext-rs";
repo = "git-stack";
rev = "v${version}";
hash = "sha256-QpRgAcbaZP5pgqMCoYAUybp8NkSkfGqNsZYXZp3Zdtc=";
hash = "sha256-foItJSZ6jsLuWkO/c1Ejb45dSdzZ/ripieyVIYsEyy0=";
};
cargoHash = "sha256-L+GtqbPQCgw0n1aW/2rU8ba+acC5n0sdEl9C6lveb1I=";
cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc=";
buildInputs = lib.optionals stdenv.isDarwin [
Security

22
pkgs/development/compilers/openjdk/darwin/17.nix
View File

@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-17-lts&os=macos&package=jdk
# Note that the latest build may differ by platform
@ -7,14 +13,18 @@ let
arch = "x64";
zuluVersion = "17.44.15";
jdkVersion = "17.0.8";
hash = "sha256-Ci18gBkAv/UUIQw9KlnfibcQMXwQRGx6K7L/NBB7b7Q=";
hash =
if enableJavaFX then "sha256-gmDku/AkWzO+eDRitezM9wCtTYDrUMtXyMulxqi9tNI="
else "sha256-Ci18gBkAv/UUIQw9KlnfibcQMXwQRGx6K7L/NBB7b7Q=";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "17.44.15";
jdkVersion = "17.0.8";
hash = "sha256-8b81QY6DGXVOsTKM8QDzJnYjXV0ipCbYWaaz6oF2A6k=";
hash =
if enableJavaFX then "sha256-mvyfqpnAoA05HJB9EBewW2MDuhQBOvp6svzyayV1irI="
else "sha256-8b81QY6DGXVOsTKM8QDzJnYjXV0ipCbYWaaz6oF2A6k=";
};
}."${stdenv.hostPlatform.system}";
@ -23,12 +33,14 @@ let
hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) hash;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};

22
pkgs/development/compilers/openjdk/darwin/18.nix
View File

@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk
# Note that the latest build may differ by platform
@ -7,14 +13,18 @@ let
arch = "x64";
zuluVersion = "18.32.13";
jdkVersion = "18.0.2.1";
hash = "sha256-uHPcyOgxUdTgzmIVRp/awtwve9zSt+1TZNef7DUuoRg=";
hash =
if enableJavaFX then "sha256-ZVZ1gbpJwxTduq2PPOCKqbSl+shq2NTFgqG++OXvFcg="
else "sha256-uHPcyOgxUdTgzmIVRp/awtwve9zSt+1TZNef7DUuoRg=";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "18.32.13";
jdkVersion = "18.0.2.1";
hash = "sha256-jAZDgxtWMq/74yKAxA69oOU0C9nXvKG5MjmZLsK04iM=";
hash =
if enableJavaFX then "sha256-tNx0a1u9iamcN9VFOJ3eqDEA6C204dtIBJZvuAH2Vjk="
else "sha256-jAZDgxtWMq/74yKAxA69oOU0C9nXvKG5MjmZLsK04iM=";
};
}."${stdenv.hostPlatform.system}";
@ -23,12 +33,14 @@ let
hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) hash;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};

26
pkgs/development/compilers/openjdk/darwin/19.nix
View File

@ -1,20 +1,30 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk
# Note that the latest build may differ by platform
dist = {
x86_64-darwin = {
arch = "x64";
zuluVersion = "19.32.13";
zuluVersion = if enableJavaFX then "19.32.15" else "19.32.13";
jdkVersion = "19.0.2";
hash = "sha256-KARXWumsY+OcqpEOV2EL9SsPni1nGSipjRji/Mn2KsE=";
hash =
if enableJavaFX then "sha256-AwLcIId0gH5D6DUU8CgJ3qnKVQm28LXYirBeXBHwPYE="
else "sha256-KARXWumsY+OcqpEOV2EL9SsPni1nGSipjRji/Mn2KsE=";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "19.32.13";
zuluVersion = if enableJavaFX then "19.32.15" else "19.32.13";
jdkVersion = "19.0.2";
hash = "sha256-F30FjZaLL756X/Xs6xjNwW9jds4pEATxoxOeeLL7Y5E=";
hash =
if enableJavaFX then "sha256-/R2rrcBr64qPGEtvhruXBhPwnvurt/hiR1ICzZAdYxE="
else "sha256-F30FjZaLL756X/Xs6xjNwW9jds4pEATxoxOeeLL7Y5E=";
};
}."${stdenv.hostPlatform.system}";
@ -23,12 +33,14 @@ let
hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) hash;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};

22
pkgs/development/compilers/openjdk/darwin/20.nix
View File

@ -1,4 +1,10 @@
{ lib, stdenv, fetchurl, unzip, setJavaClassPath }:
{ lib
, stdenv
, fetchurl
, unzip
, setJavaClassPath
, enableJavaFX ? false
}:
let
# Details from https://www.azul.com/downloads/?version=java-19-sts&os=macos&package=jdk
# Note that the latest build may differ by platform
@ -7,14 +13,18 @@ let
arch = "x64";
zuluVersion = "20.32.11";
jdkVersion = "20.0.2";
hash = "sha256-Ev9KG6DvuBnsZrOguLsO1KQzudHCBcJNwKh45Inpnfo=";
hash =
if enableJavaFX then "sha256-hyxQAivZAXtqMebe30L+EYa7p+TdSdKNYj7Rl/ZwRNQ="
else "sha256-Ev9KG6DvuBnsZrOguLsO1KQzudHCBcJNwKh45Inpnfo=";
};
aarch64-darwin = {
arch = "aarch64";
zuluVersion = "20.32.11";
jdkVersion = "20.0.2";
hash = "sha256-15uNZ6uMfSASV3QU2q2oA/jBk2PCHOfSjn1GY7/7qIY=";
hash =
if enableJavaFX then "sha256-iPQzZS4CwaoqT8cSzg4kWCT1OyGBSJLq+NETcbucLo4="
else "sha256-15uNZ6uMfSASV3QU2q2oA/jBk2PCHOfSjn1GY7/7qIY=";
};
}."${stdenv.hostPlatform.system}";
@ -23,12 +33,14 @@ let
hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";
};
javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";
jdk = stdenv.mkDerivation rec {
pname = "zulu${dist.zuluVersion}-ca-jdk";
pname = "zulu${dist.zuluVersion}-${javaPackage}";
version = dist.jdkVersion;
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";
inherit (dist) hash;
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
};

4
pkgs/development/libraries/ctre/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ctre";
version = "3.7.2";
version = "3.8";
src = fetchFromGitHub {
owner = "hanickadot";
repo = "compile-time-regular-expressions";
rev = "v${version}";
hash = "sha256-pO6PW4oZsCA2xaMCsaJz2Bu203zyMUkbjO3OOBEbSiw=";
hash = "sha256-oGJHSyvcgvBJh5fquK6dU70czVg4txcGTuicvrTK2hc=";
};
nativeBuildInputs = [ cmake ];

49
pkgs/development/libraries/openvr/default.nix
View File

@ -1,23 +1,23 @@
{ lib
, stdenv
{ AppKit
, cmake
, libGL
, jsoncpp
, fetchFromGitHub
, fetchpatch2
, Foundation
, AppKit
, jsoncpp
, lib
, libGL
, stdenv
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "openvr";
version = "1.23.8";
version = "1.26.7";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = pname;
rev = "v${version}";
hash = "sha256-ZdL1HDRSpPykbV3M0CjCZkOt7XlF7Z7OAhOey2ALeHg=";
repo = "openvr";
rev = "v${finalAttrs.version}";
hash = "sha256-verVIRyDdpF8lIjjjG8GllDJG7nhqByIfs/8O5TMOyc=";
};
patches = [
@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
(fetchpatch2 {
name = "use-correct-CPP11-definition-for-vsprintf_s.patch";
url = "https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch";
sha256 = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4=";
hash = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4=";
})
# https://github.com/ValveSoftware/openvr/pull/1716
(fetchpatch2 {
name = "add-ability-to-build-with-system-installed-jsoncpp.patch";
url = "https://github.com/ValveSoftware/openvr/commit/54a58e479f4d63e62e9118637cd92a2013a4fb95.patch";
sha256 = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U=";
hash = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U=";
})
];
@ -42,17 +42,26 @@ stdenv.mkDerivation rec {
mv source/src/json source/thirdparty/jsoncpp
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ jsoncpp libGL ] ++ lib.optionals stdenv.isDarwin [ Foundation AppKit ];
nativeBuildInputs = [
cmake
];
buildInputs = [
jsoncpp
libGL
] ++ lib.optionals stdenv.isDarwin [
AppKit
Foundation
];
cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ];
meta = with lib; {
meta = {
broken = stdenv.isDarwin;
homepage = "https://github.com/ValveSoftware/openvr";
description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting";
license = licenses.bsd3;
maintainers = with maintainers; [ pedrohlc Scrumplex ];
platforms = platforms.unix;
homepage = "https://github.com/ValveSoftware/openvr";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ pedrohlc Scrumplex ];
platforms = lib.platforms.unix;
};
}
})

16
pkgs/development/python-modules/angrcli/default.nix
View File

@ -24,6 +24,11 @@ buildPythonPackage rec {
hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
};
postPatch = ''
substituteInPlace tests/test_derefs.py \
--replace "/bin/ls" "${coreutils}/bin/ls"
'';
propagatedBuildInputs = [
angr
cmd2
@ -35,17 +40,18 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace tests/test_derefs.py \
--replace "/bin/ls" "${coreutils}/bin/ls"
'';
disabledTests = lib.optionals (!stdenv.hostPlatform.isx86) [
# expects the x86 register "rax" to exist
"test_cc"
"test_loop"
"test_max_depth"
];
pythonImportsCheck = [
"angrcli"
];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "Python modules to allow easier interactive use of angr";
homepage = "https://github.com/fmagin/angr-cli";
license = with licenses; [ mit ];

2
pkgs/development/python-modules/dremel3dpy/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, async-timeout
, buildPythonPackage
, decorator
, fetchPypi
, imageio
, imutils
@ -26,6 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
async-timeout
decorator
imageio
imutils
requests

7
pkgs/development/python-modules/numba/default.nix
View File

@ -29,7 +29,7 @@ let
in buildPythonPackage rec {
# Using an untagged version, with numpy 1.25 support, when it's released
# also drop the versioneer patch in postPatch
version = "unstable-2023-08-02";
version = "unstable-2023-08-11";
pname = "numba";
format = "setuptools";
disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
@ -37,7 +37,7 @@ in buildPythonPackage rec {
src = fetchFromGitHub {
owner = "numba";
repo = "numba";
rev = "fcf94205335dcc6135d2e19c07bbef968d13610d";
rev = "6f0c5060a69656319ab0bae1d8bb89484cd5631f";
# Upstream uses .gitattributes to inject information about the revision
# hash and the refname into `numba/_version.py`, see:
#
@ -50,7 +50,7 @@ in buildPythonPackage rec {
# use `forceFetchGit = true;`.` If in the future we'll observe the hash
# changes too often, we can always use forceFetchGit, and inject the
# relevant strings ourselves, using `sed` commands, in extraPostFetch.
hash = "sha256-Wm1sV4uS/Xkz1BkT2xNmwgBZS0X8YziC6jlbfolXGB8=";
hash = "sha256-34qEn/i2X6Xu1cjuiRrmrm/HryNoN+Am4A4pJ90srAE=";
};
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
@ -131,6 +131,7 @@ in buildPythonPackage rec {
description = "Compiling Python code using LLVM";
homepage = "https://numba.pydata.org/";
license = licenses.bsd2;
mainProgram = "numba";
maintainers = with maintainers; [ fridh ];
};
}

6
pkgs/development/python-modules/opower/default.nix
View File

@ -3,6 +3,7 @@
, arrow
, buildPythonPackage
, fetchFromGitHub
, pyotp
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
@ -11,7 +12,7 @@
buildPythonPackage rec {
pname = "opower";
version = "0.0.20";
version = "0.0.26";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +21,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "opower";
rev = "refs/tags/v${version}";
hash = "sha256-hb+TVnCAAnsoKPk9N1bDXj463CErp7nn2cteOumKhLs=";
hash = "sha256-W2lzMyu9N1ZLLaxoI8JLthtF7Zj3si1/mEVn5NrAlfU=";
};
pythonRemoveDeps = [
@ -36,6 +37,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
arrow
pyotp
];
nativeCheckInputs = [

14
pkgs/development/python-modules/pyairvisual/default.nix
View File

@ -2,9 +2,11 @@
, aiohttp
, aresponses
, buildPythonPackage
, certifi
, fetchFromGitHub
, numpy
, poetry-core
, pygments
, pysmb
, pytest-aiohttp
, pytest-asyncio
@ -14,7 +16,7 @@
buildPythonPackage rec {
pname = "pyairvisual";
version = "2022.12.1";
version = "2023.08.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,16 +25,24 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-xzTho4HsIU2YLURz9DfFfaRL3tsrtVi8n5IA2bRkyzw=";
hash = "sha256-+yqN3q+uA/v01uCguzUSoeCJK9lRmiiYn8d272+Dd2M=";
};
postPatch = ''
substituteInPlace pyproject.toml --replace \
'certifi = ">=2023.07.22"' \
'certifi = "*"'
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
certifi
numpy
pygments
pysmb
];

4
pkgs/development/python-modules/python-roborock/default.nix
View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "0.32.0";
version = "0.32.2";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
rev = "refs/tags/v${version}";
hash = "sha256-DojIfAmYW/asvpAkcBj/pN1rdCPFD4nwkEqpGVBkMoE=";
hash = "sha256-QMKdStv8WNGUjRrtU6ZKXsJPsYWMXbDMqWUO1nkD1Cc=";
};
pythonRelaxDeps = [

47
pkgs/development/tools/analysis/cppcheck/default.nix
View File

@ -1,30 +1,43 @@
{ lib
, stdenv
{ docbook_xsl
, docbook_xml_dtd_45
, fetchFromGitHub
, installShellFiles
, pcre
, python3
, lib
, libxslt
, docbook_xsl
, docbook_xml_dtd_45
, which
, pcre
, pkg-config
, python3
, stdenv
, which
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cppcheck";
version = "2.11.1";
src = fetchFromGitHub {
owner = "danmar";
repo = "cppcheck";
rev = version;
rev = finalAttrs.version;
hash = "sha256-ZQ1EgnC2JBc0AvSW8PtgMzJoWSPt04Xfh8dqOU+KMfw=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which python3 ];
buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ];
nativeBuildInputs = [
docbook_xsl
docbook_xml_dtd_45
installShellFiles
libxslt
pkg-config
python3
which
];
buildInputs = [
pcre
(python3.withPackages (ps: [ ps.pygments ]))
];
makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ];
@ -58,15 +71,15 @@ stdenv.mkDerivation rec {
runHook postInstallCheck
'';
meta = with lib; {
meta = {
description = "A static analysis tool for C/C++ code";
homepage = "http://cppcheck.sourceforge.net/";
license = lib.licenses.gpl3Plus;
longDescription = ''
Check C/C++ code for memory leaks, mismatching allocation-deallocation,
buffer overruns and more.
'';
homepage = "http://cppcheck.sourceforge.net/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ joachifm ];
maintainers = with lib.maintainers; [ joachifm ];
platforms = lib.platforms.unix;
};
}
})

4
pkgs/development/tools/database/clickhouse-backup/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "clickhouse-backup";
version = "2.3.1";
version = "2.3.2";
src = fetchFromGitHub {
owner = "AlexAkulov";
repo = pname;
rev = "v${version}";
sha256 = "sha256-93dSeZL3W/6S46JYSbj/7ccHFBI3VKBD8TNKRO9fIZc=";
sha256 = "sha256-B6MImom0BSvbZVjeMWvF+oDEfoALl4xhXXitaOOU/ZI=";
};
vendorHash = "sha256-YSr3fKqJJtNRbUW1TjwDM96cA6CoYz1LUit/pC8V3Fs=";

8
pkgs/games/osu-lazer/bin.nix
View File

@ -7,21 +7,21 @@
let
pname = "osu-lazer-bin";
version = "2023.803.0";
version = "2023.811.0";
name = "${pname}-${version}";
osu-lazer-bin-src = {
aarch64-darwin = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
sha256 = "sha256-41UvP3h7Nnmjnjr1nl35uCe6CUK54p1Ok1KhQ8F5/4M=";
sha256 = "sha256-T8Zyl93AV5eYdBDQHIRgJIHse4nNnJYVHsgnH/TbJpM=";
};
x86_64-darwin = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
sha256 = "sha256-qxAgXL4igfttsPN3xr4JPBGy9FalR1JIS7OtB4iqNB8=";
sha256 = "sha256-uT3tx4cljjb1/4ewuYiFp1g6hEJeaRQofrySh6ebrdA=";
};
x86_64-linux = {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
sha256 = "sha256-fO9j7hIEhxEDWVdNAPVriHuDQyF2XgReeROBNpXM8gU=";
sha256 = "sha256-PRFnn+4znylKyvDx+wz9MwY4XqpMIk8Tlpon5ATwmWo=";
};
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");

4
pkgs/games/osu-lazer/default.nix
View File

@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2023.803.0";
version = "2023.811.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
sha256 = "sha256-q2rw44veVWpKcW/wCkBHNxaIwOXuflejIvqhGQgoh8o=";
sha256 = "sha256-LRVec2nwT7Benzov59qxVWzFXO/MsotRUHPIUosH2fw=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

8
pkgs/games/osu-lazer/deps.nix generated
View File

@ -6,7 +6,7 @@
(fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; })
(fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; sha256 = "03ja3g66lb0smjmkr3yf28h7fy52wwbdnf6p268zfla3azh006pq"; })
(fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.4.20"; sha256 = "115nbg7d4j2v5l40hqp4q4s0pm84r1yl7d8fbxyw89s1nbab6qp3"; })
(fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; })
(fetchNuGet { pname = "Fody"; version = "6.7.0"; sha256 = "0fv0zrffa296qjyi11yk31vfqh6gm1nxsx8g5zz380jcsrilnp3h"; })
(fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; })
@ -134,10 +134,10 @@
(fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; })
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; })
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.716.0"; sha256 = "11qzwxrmbnzrx0g3dqx9ici58kfn5b3g3riwis3fsjfyiziwzvx8"; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.811.0"; sha256 = "121jdz1zxivr4nddjjwnf4996awaxbcb7mxp279495z3gg44x9kb"; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; })
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.709.0"; sha256 = "1p7lh7583lka6awb4q3vwfhlmry69n9gfjp2h0zm2bvyn9p1928f"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.707.0"; sha256 = "1hndj38qpi7936z7dh6lyip00hvx99q8xzrmkvrp9562ys9xjdpw"; })
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.719.0"; sha256 = "1isy0jd8xkjw72m4akh85nmlcfp6na1ksghyajs4amiagjgvvn47"; })
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; })
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g9f8aa2931a"; sha256 = "0jzjaakcfy3x85wx8smp4j7hffbynqakgqvwslr3bkbqlfdxxbil"; })

6
pkgs/os-specific/linux/plymouth/default.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "plymouth";
version = "unstable-2023-06-05";
version = "unstable-2023-06-17";
outputs = [ "out" "dev" ];
@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
domain = "gitlab.freedesktop.org";
owner = "plymouth";
repo = "plymouth";
rev = "a5eda165689864cc9a25ec14fd8c6da458598f42";
hash = "sha256-TpMZZ0naC4D0Knmclc8JpmXPfnpM6q8YotIkNX+aRVo=";
rev = "b1d5aa9d2a6033bba52cf63643e5878f8a9b68a0";
hash = "sha256-8DXcwt8CZTni5Ma+I63LzNejlIB0Cr1ATA7Nl3z9z6I=";
};
patches = [

5
pkgs/servers/dendrite/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub, fetchpatch
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, nix-update-script
, nixosTests, postgresql, postgresqlTestHook }:
buildGoModule rec {
@ -55,6 +55,9 @@ buildGoModule rec {
passthru.tests = {
inherit (nixosTests) dendrite;
};
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex" "v(.+)" ];
};
meta = with lib; {
homepage = "https://matrix-org.github.io/dendrite";

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.8.1";
version = "2023.8.2";
components = {
"3_day_blinds" = ps: with ps; [
];

6
pkgs/servers/home-assistant/default.nix
View File

@ -295,7 +295,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.8.1";
hassVersion = "2023.8.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-u20hEdVoxp2MzLo6OonQZnkoxqK+myt4LwqB+mz3ipE=";
hash = "sha256-GFcCaB9Q7tAo3w1aKkLcQ4tKZM61kArveITe2wHsXWk=";
};
# Secondary source is git for tests
@ -319,7 +319,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-CrfVokUk3KnkavM+/ci70ela7aJ60TSNymoCzZdxaIY=";
hash = "sha256-xNdFqJHWs0QAVNxjhGzQFVV+dGc4r/DA0Xm/BWHfSZw=";
};
nativeBuildInputs = with python.pkgs; [

4
pkgs/servers/home-assistant/stubs.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2023.8.0";
version = "2023.8.2";
format = "pyproject";
disabled = python.version != home-assistant.python.version;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
hash = "sha256-znnNWQpoJ+omYt7keW14Nc7FDqiCpZNsEWL0hEijtsI=";
hash = "sha256-uoDpwXJfZC26oesMTv1mjO7Ib0dKamTQdIYyLJnrERk=";
};
nativeBuildInputs = [

6
pkgs/tools/misc/chezmoi/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "chezmoi";
version = "2.36.1";
version = "2.37.0";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
hash = "sha256-OZrQxF5fuKpauy3wk6q3bUh1uUw14nkEldrzYPiOVIQ=";
hash = "sha256-AXn2D4vWiFYlmAN2egqKdi5vOYU88FopEGYyDGgy0ig=";
};
vendorHash = "sha256-H7sbpDZMkPF5qw9urb/Gfmy8b9T4UEsnl6CGlZ1LThQ=";
vendorHash = "sha256-OU1ChDJiIeRjBBKVcxah/cEXScepW0VY9tkNDALT4fI=";
doCheck = false;

6
pkgs/tools/misc/f2/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "f2";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "ayoisaiah";
repo = "f2";
rev = "v${version}";
sha256 = "sha256-2+wp9hbPDH8RAeQNH1OYDfFlev+QTsEHixYb/luR9F0=";
sha256 = "sha256-vpyI6WtK/0UpPiB8y+HpPd0IsKKkMHa/eIreYo32iAA=";
};
vendorHash = "sha256-sOTdP+MuOH9jB3RMajeUx84pINSuWVRw5p/9lrOj6uo=";
vendorHash = "sha256-Bz3Igjcyq4rkMkgv1J3+JiAqroAjxyAvHw4d4eZJgAM=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

4
pkgs/tools/misc/svtplay-dl/default.nix
View File

@ -15,7 +15,7 @@ let
python pytest nose cryptography pyyaml requests mock requests-mock
python-dateutil setuptools;
version = "4.24";
version = "4.25";
in
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
hash = "sha256-ZUQi0KWnzIlEbFNTouJkd7cE5KPdrKZQfzwo4OeQZU4=";
hash = "sha256-vYcBK7jgoBEC7dZ+5osJ/Q85wSNLXO02wcv9GHaa0Ds=";
};
pythonPaths = [ cryptography pyyaml requests ];

6
pkgs/tools/networking/goflow2/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "goflow2";
version = "1.3.4";
version = "2.0.0";
src = fetchFromGitHub {
owner = "netsampler";
repo = pname;
rev = "v${version}";
hash = "sha256-0E3iSO+ObaPhIUerF4y5UygJMSMJNTJwI6RqHunqrZ0=";
hash = "sha256-tY2+4lGy+2thpRDNeTw1kfOtZvOspXCYU7dhYcckbRo=";
};
ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
"-X=main.version=${version}"
];
vendorHash = "sha256-tNrCsCKBoUsrCOlbI1FUoksWoI4jUiYLF+A8Fjfe9Qk=";
vendorHash = "sha256-KcknR2IaHz2EzOFwSHppbmNDISrFdNoB4QmLT74/KWY=";
meta = with lib; {
description = "High performance sFlow/IPFIX/NetFlow Collector";

36
pkgs/tools/networking/qcal/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, buildGoModule
, fetchFromSourcehut
}:
buildGoModule rec {
pname = "qcal";
version = "0.9.1";
src = fetchFromSourcehut {
owner = "~psic4t";
repo = "qcal";
rev = version;
hash = "sha256-Rj806cKCFxWB8X4EiKvyZ5/xACw+VVbo9hv8AJiB0S4=";
};
vendorHash = "sha256-ntpSj3Ze7n1sMIMojaESi4tQtx+mrA0aiv3+MQetjZI=";
# Replace "config-sample.json" in error message with the absolute path
# to that config file in the nix store
preBuild = ''
substituteInPlace helpers.go \
--replace " config-sample.json " " $out/share/config-sample.json "
'';
postInstall = ''
mkdir -p $out/share
cp config-sample.json $out/share/
'';
meta = with lib; {
description = "CLI calendar application for CalDAV servers written in Go";
homepage = "https://git.sr.ht/~psic4t/qcal";
license = licenses.gpl3;
mainProgram = "qcal";
maintainers = with maintainers; [ antonmosich ];
};
}

3
pkgs/tools/security/cryptomator/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub
, autoPatchelfHook
, fuse3
, maven, jdk, makeShellWrapper, glib, wrapGAppsHook
@ -10,6 +10,7 @@ let
jdk = jdk;
};
in
assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'`
mavenJdk.buildMavenPackage rec {
pname = "cryptomator";
version = "1.9.1";

6
pkgs/tools/security/gotrue/supabase.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gotrue";
version = "2.83.1";
version = "2.92.0";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-3H2B6gEL9qatR49P+0E+O0EDd+uylb0nDETqxW+XuFY=";
hash = "sha256-acOTuvs9AFDGdmj4dwTAabhO31MAJgYOVZghlPQiXT4=";
};
vendorHash = "sha256-eG6zB/nfsYYvvLf5i8AySkTfXv9rIGTTmyMA4PtcGjg=";
vendorHash = "sha256-r1xJka1ISahaHJOkFwjn/Nrf2EU0iGVosz8PZnH31TE=";
ldflags = [
"-s"

66
pkgs/tools/system/nvidia-system-monitor-qt/default.nix Normal file
View File

@ -0,0 +1,66 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, qtbase
, wrapQtAppsHook
, makeDesktopItem
, copyDesktopItems
}:
let
# Based in desktop files from official packages:
# https://github.com/congard/nvidia-system-monitor-qt/tree/master/package
desktopItem = makeDesktopItem {
name = "nvidia-system-monitor-qt";
desktopName = "NVIDIA System Monitor";
icon = "qnvsm";
exec = "qnvsm";
categories = [
"System"
"Utility"
"Qt"
];
};
in
stdenv.mkDerivation rec {
pname = "nvidia-system-monitor-qt";
version = "1.5";
src = fetchFromGitHub {
owner = "congard";
repo = "nvidia-system-monitor-qt";
rev = "v${version}";
sha256 = "sha256-VDw5Wp/QFDV1zKF4yz0aR0Hox9KHXZmeAKzKLSlu8Ck=";
};
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake wrapQtAppsHook copyDesktopItems ];
cmakeFlags = [
"-DIconPath=${placeholder "out"}/share/icons/hicolor/512x512/apps/qnvsm.png"
"-DVersionPrefix=(Nixpkgs)"
];
installPhase = ''
runHook preInstall
install -Dm755 qnvsm $out/bin/qnvsm
install -Dm644 $src/icon.png $out/share/icons/hicolor/512x512/apps/qnvsm.png
runHook postInstall
'';
desktopItems = [ desktopItem ];
meta = rec {
description = "Task Manager for Linux for NVIDIA graphics cards";
homepage = "https://github.com/congard/nvidia-system-monitor-qt";
downloadPage = "${homepage}/releases";
changelog = "${downloadPage}/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hacker1024 ];
mainProgram = "qnvsm";
platforms = lib.platforms.linux;
};
}

6
pkgs/tools/virtualization/jumppad/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "jumppad";
version = "0.5.35";
version = "0.5.38";
src = fetchFromGitHub {
owner = "jumppad-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-ZqP1m2Fbm9bn9uxJ7Ll4Vqa+STIrxX0jALGZJmOyAT8=";
hash = "sha256-s779QQ1fzVKFIMoj7X3MLLo1Z3NBSGPoKoDi3xM0fr8=";
};
vendorHash = "sha256-LneL4SzvcThfqqWdKpAU3mFAW1FVRTU9/T3l+yKBSME=";
vendorHash = "sha256-37j7taSmWhs9NQbv41aljR07HCTRrLd3ddiktV/XKBs=";
ldflags = [
"-s" "-w" "-X main.version=${version}"

4
pkgs/top-level/all-packages.nix
View File

@ -24056,6 +24056,8 @@ with pkgs;
nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { };
nvitop = callPackage ../tools/system/nvitop { };
nvtop = callPackage ../tools/system/nvtop { };
@ -27069,6 +27071,8 @@ with pkgs;
radicale = radicale3;
qcal = callPackage ../tools/networking/qcal/default.nix { };
rake = callPackage ../development/tools/build-managers/rake { };
rakkess = callPackage ../development/tools/rakkess { };