diff options
Diffstat (limited to 'pkgs')
136 files changed, 1461 insertions, 734 deletions
diff --git a/pkgs/README.md b/pkgs/README.md index 642833d968f..7f9b2fb2207 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -696,16 +696,16 @@ It can happen that non-trivial updates include patches or more complex changes. Reviewing process: -- Ensure that the package versioning fits the guidelines. -- Ensure that the commit text fits the guidelines. +- Ensure that the package versioning [fits the guidelines](#versioning). +- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions). - Ensure that the package maintainers are notified. - [CODEOWNERS](https://help.github.com/articles/about-codeowners) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers. -- Ensure that the meta field information is correct. +- Ensure that the meta field information [fits the guidelines](#meta-attributes) and is correct: - License can change with version updates, so it should be checked to match the upstream license. - If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package. - Ensure that the code contains no typos. -- Building the package locally. - - pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds. +- Build the package locally. + - Pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds. - It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. ```ShellSession @@ -722,7 +722,7 @@ Reviewing process: ```ShellSession $ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER" ``` -- Running every binary. +- Run every binary. Sample template for a package update review is provided below. @@ -731,7 +731,7 @@ Sample template for a package update review is provided below. - [ ] package name fits guidelines - [ ] package version fits guidelines -- [ ] package build on ARCHITECTURE +- [ ] package builds on ARCHITECTURE - [ ] executables tested on ARCHITECTURE - [ ] all depending packages build - [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed @@ -748,18 +748,20 @@ New packages are a common type of pull requests. These pull requests consists in Review process: -- Ensure that the package versioning fits the guidelines. -- Ensure that the commit name fits the guidelines. -- Ensure that the meta fields contain correct information. +- Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation). +- Ensure that the package name and version [fits the guidelines](#package-naming). +- Ensure that the package versioning [fits the guidelines](#versioning). +- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions). +- Ensure that the meta fields [fits the guidelines](#meta-attributes) and contain the correct information: - License must match the upstream license. - Platforms should be set (or the package will not get binary substitutes). - Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package. - Report detected typos. - Ensure the package source: - - Uses mirror URLs when available. + - Uses `mirror://` URLs when available. - Uses the most appropriate functions (e.g. packages from GitHub should use `fetchFromGitHub`). -- Building the package locally. -- Running every binary. +- Build the package locally. +- Run every binary. Sample template for a new package review is provided below. @@ -769,7 +771,7 @@ Sample template for a new package review is provided below. - [ ] package path fits guidelines - [ ] package name fits guidelines - [ ] package version fits guidelines -- [ ] package build on ARCHITECTURE +- [ ] package builds on ARCHITECTURE - [ ] executables tested on ARCHITECTURE - [ ] `meta.description` is set and fits guidelines - [ ] `meta.license` fits upstream license diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 44e6dd1cd8a..e0b761a70f9 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }: +{ lib, stdenv, fetchFromGitHub, libjack2, libsndfile, pkg-config }: stdenv.mkDerivation rec { pname = "jack_capture"; - version = "0.9.73"; + version = "0.9.73.2023-01-04"; - src = fetchurl { - url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz"; - sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; + src = fetchFromGitHub { + owner = "kmatheussen"; + repo = "jack_capture"; + rev = "a539d444d388c4cfed7279e385830e7767d59c41"; + sha256 = "sha256-2DavZS4esV17a3vkiPvfCfp0QF94ZcXqdIw84h9HDjA="; }; nativeBuildInputs = [ pkg-config ]; @@ -23,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program for recording soundfiles with jack"; - homepage = "http://archive.notam02.no/arkiv/src"; + homepage = "https://github.com/kmatheussen/jack_capture/"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu orivej ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/applications/audio/xtuner/default.nix index c5185217911..1fdb97f6dad 100644 --- a/pkgs/applications/audio/xtuner/default.nix +++ b/pkgs/applications/audio/xtuner/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cairo , libX11 @@ -22,6 +23,17 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Fix build against glibc-2.38. + (fetchpatch { + name = "glibc-2.38.patch"; + url = "https://github.com/brummer10/libxputty/commit/7eb70bf3f7bce0af9e1919d6c875cdb8efca734e.patch"; + hash = "sha256-VspR0KJjBt4WOrnlo7rHw1oAYM1d2RSz6JhuAEfsO3M="; + stripLen = 1; + extraPrefix = "libxputty/"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo libX11 libjack2 liblo libsigcxx zita-resampler fftwFloat ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 46b389ab805..ac3dabe5436 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "80580573cb7be3f9253ff4b4213328074cf15c59"; - sha256 = "0fq73dlyar77ym60szfv62gik70bzldk7djfy5k70w4fbgilfpb1"; + rev = "a937222abcc2843c13f0a92576a215d391829811"; + sha256 = "1snvkv6ba4kciz4xq2810ffsg4nnlzjp5vddj9x68q2bvssh8xlc"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "3b89343711d5e2847feaa280ebe418c452a2a923"; - sha256 = "0py7clhanhifi2rrsgq41fvikr2ga33fcb2d7af401bdi9m9vmfw"; + rev = "51bdd35f4f984293d4200e52aeff44f12febc6f2"; + sha256 = "1kg7bzs01h05c0x8lgq1h98qwfy8x6ljbwcryya2750azc6bgmh8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -811,12 +811,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-11-01"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "a7517e3dca1d4b75cba6e37d9d1f96ee1af1e7d1"; - sha256 = "14gv7w3kwlj20hhmjcd86n1mgk0fgmda39km59b947d4k6l6y6l9"; + rev = "b085a8952dfa3a0fe245a8aae2799236833001f1"; + sha256 = "04pz7cn876dqysr8ky5wfffi6zybvzqz7hx59z7fbf59x4jzlpfg"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -1243,12 +1243,12 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-10-05"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "cd2a10557b4a13e80929f59a7076ae792b2c60fa"; - sha256 = "0mfzxb9xw325b3li077qd23gys9j66jhpyz2dd9kz2xya7jvl6rb"; + rev = "f77b477d9f0b9a28612212b3fc43145f2a5591cc"; + sha256 = "0xp4h8yhlm9kfr4m5446g95mvqr4imhrzwhg726hrdkfs04b1hzq"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "e388bd6725d83f83639e24482b9d1bca01c0c040"; - sha256 = "18pim7niv4x8rbfm5bsz2fnnpsskw65qcl0rq7hfhnj7pvb0lb3i"; + rev = "ca3dfba94600aa62bfc88ae37cbd4f17eaea2553"; + sha256 = "192r845pyszbl5jwxzs36pvjn4c4si4n0ywnqlia0w03vac4zz8g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2444,12 +2444,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-10-19"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "aac57ef84cf4fecf7907114b22e875f84a6128ee"; - sha256 = "0xqpj6zhydx8n08s00i3zji2383dp13xy3smsvzgim8wmwfklk6s"; + rev = "f47c77d99f11362ddc2f4891f35407fb0b76d485"; + sha256 = "1sr71k5ngsjxzhldr06cb2bf79mn6096czn17ql22j99w92gydk5"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -3046,12 +3046,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-11-10"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "af022e088b98d935d4a12337f7c4bbde6d7a59c9"; - sha256 = "0pawws18fbizavc3vba89lmd4qmdfpi3gqizjbb79c0hk2qgls5v"; + rev = "c41904a3dcc103587b1157da13d565a0a5f9f3a5"; + sha256 = "0q0b5llz4jmpqlv4yx929wbhsnqjd62ng5kjmiwl3nylz1gndgmk"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3143,12 +3143,12 @@ final: prev: elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-11-08"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "f98a90e071786c3a99a280c7b11cf6c0a6c00a0b"; - sha256 = "1n1hh0arlhn9jh01m2f9sv19g7hfwz8lg7yhr50n0xcdmg0z4adh"; + rev = "517ffd8366e4065ba66e0fb0c8e8ce192906db5d"; + sha256 = "1b38zb5nisyk5msz045vw5ibl35jd31zskj26qm93z8h29b3f0xa"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3877,12 +3877,12 @@ final: prev: godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2023-11-10"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "e7da918f2f76d1eef490b0a6034b8a4bed5c5f72"; - sha256 = "08937wj7d33k7wpix5676d44k29fn3pln1r6935h4a2p1j8hw9rh"; + rev = "09b78f294ea26af678a9ac363b7d5ce8e20b696e"; + sha256 = "0g9zp1p9rpx4bixm6hdpd7w9a483yrz73p6vfl9pn5ky0vavaz25"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -3997,12 +3997,12 @@ final: prev: gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-10-07"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "477c62493c82684ed510c4f70eaf83802e398898"; - sha256 = "0250c24c6n6yri48l288irdawhqs16qna3y74rdkgjd2jvh66vdm"; + rev = "517b012757fbe7a4d6e507baf5cc75837e62734f"; + sha256 = "1ndbd6mn19g3wiqshw9wckkl976kjvgy2dc3lmb92cyxjni8a507"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4080,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-11-08"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "4ba45b6a820bd87328c44f7053a00d243a3ff8f1"; - sha256 = "0a0brmxjlggs2rzvjm6sn0k8m4j57icd2cijgzsm1i5ylqaribg1"; + rev = "3076ac21d6ffc6d0100eb5878a1b77c6a53d8871"; + sha256 = "0fc0npgmv6zxc3v5rzxh9lqa0868pyj4kcsyg8vw9qwl1waz6pa9"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-11-01"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "ec91b89d3d3ba02b66cf7123042b90c432a7e413"; - sha256 = "0gdnkn58nqmdvkrd6zx7bg6abbzzfwz9dqpc24lz480wzvgrp9sw"; + rev = "f458f33e6ba0f3bfee233b90fb9318d42941d972"; + sha256 = "14kspw9s6wsgh0afyskkyqdbr68l7fiq75r1d22a3ffvc8m5a81w"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4812,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-11-09"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "d60c954168caf61e00af1c42dd2eb2d2ec1c1b56"; - sha256 = "05rddkw2n2dpw22inj1af4ycwkgr9dq71zap3dr2wpi6f4gaag69"; + rev = "a4868d184b0cf5114d5b0ee6aa13b1c5c4fb47fa"; + sha256 = "0q4nhp3bgbxfzg8x9grhpqfdvs7z6z4sxiz9vdm7q1ch9vq2g12q"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5064,12 +5064,12 @@ final: prev: litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; - version = "2022-09-28"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "e2dffec35740032258fee3a3c7f30123226f2271"; - sha256 = "091iga42vmkwxwr8y4p4j8l2cawja5q7n10bq7bqc9j8z6jvl9x8"; + rev = "14b66cc6ff76deb67259db99196c0da5a6c75ca2"; + sha256 = "0ynnn2rknyzyjn796lig32n1jycapg6q4zrpzllxlvqyhyhxsjf5"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -5100,12 +5100,12 @@ final: prev: litee-nvim = buildVimPlugin { pname = "litee.nvim"; - version = "2022-12-11"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2"; - sha256 = "1kl3wb0p5dwdf543hzmai07myf9i28s36y11mlxw5j7hai1cabmq"; + rev = "3c51764a615566e4c0223362f4be00acc23c430e"; + sha256 = "1y68zqlzm4ba7fg62drs2flxbyizar1m9vyqgbah7bfdvw4gw0al"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -5231,12 +5231,12 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-11-07"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "9ed85616b772a07f8db56c26e8fff2d962f1f211"; - sha256 = "0vymhx89wzmqw9xzvqj9sni0a86wql88ibn07h08qinqcnsg8kb3"; + rev = "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab"; + sha256 = "1qrzr6x90m6kksrw0hknraplkzxh6zkdw46gchr89y05j54wvlgs"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -5267,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-11-07"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "8b027966d1d5845831107a2505999d380cb18669"; - sha256 = "10nnrm2ijjycl95r0k01kgamvrai9w4pi1hcy24i01yc0nm8r234"; + rev = "283a3fc8e01191095d33c078031c577e8f9427b9"; + sha256 = "0r70gssbdkplmfacbcafr1d9hh0k61ybpcw65lplx7ya8q62yb0k"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5315,12 +5315,12 @@ final: prev: luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-11-04"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "a4de64570b9620875c8ea04175cd07ed8e32ac99"; - sha256 = "0k6ql48hm0z9ii5p07cs217wz376fz8q1syl65xjcfnlvbdxb6x8"; + rev = "46c91e814732c1630b8a8b50d04acbf54b8320fa"; + sha256 = "1bx2sjqr2rvyl2zyc4rymg1sl67gw542vfpl857dx7yhabr9xj4d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5544,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-11-09"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e1f49ae456f4e6e8b79e657965f295886fbe2101"; - sha256 = "1nawpz9ssw4igca3q3jm74q1mk16f1r20mgmncpayijvcl1l5nxg"; + rev = "f2b89efbbad1943657e43f474fe308fceb63597e"; + sha256 = "1yyqb3plmzmfpidcij66j3mcg37ysf3bs1s5wyyi7hxqw6hqqhk4"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5604,12 +5604,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-11-07"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "1bd568305834b7355cd33826e0984d5818f01d11"; - sha256 = "0wx0zdzdfwc7ihglhn978c2i59b7r3b0nazwfcyi2yqsva2y8gb7"; + rev = "3918f17ab136a469a81881a194068609f0a878d4"; + sha256 = "1xkfg8hmglyx8y8b2hlv40n904naiar1abb29r2lvdwri8aksql5"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5940,12 +5940,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-11-10"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "b6d8bee23444a267afa8b5dbdb9d82dbf39173ec"; - sha256 = "0vnlg9hswzamdbqy842ymfm4h4mny97ijwsl3fq987ql3cjbpvx3"; + rev = "0f6e7acfd86b052acf78baccba04d5c61dcbbc0d"; + sha256 = "0glq1ywx1q8sqs3fkq071cqmwa6sn18glx1l0gmyvaxr0q9bijmh"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5988,24 +5988,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "20f1e5d3c143333bdf5ea48729f7b50660135cb3"; - sha256 = "0zkxq0wkbxq3yk1vgmhnb4cszvf13yx3z8886nfadnbl9v7rhkl5"; + rev = "f93a984ee75ba6d532d85419619cc6e91d954ee9"; + sha256 = "0aisb4kwjys02za4rp2ai9qk64f3rx8xwwz1y20ki9q6729623d5"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-10-31"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f"; - sha256 = "19x9yppzln80pqdwbinfdn7ip0syrcq8wf45j0y80x1v7hk6hn1q"; + rev = "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7"; + sha256 = "1263nvq9a275340hdnkimz70xq615a9rz2s8szncii35z10szjm7"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6108,24 +6108,24 @@ final: prev: neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2023-10-26"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "c3d25cc46145fba82c410245fb5bea66945eb1de"; - sha256 = "0pskhg2d5c6abcv568aiv39jqd50bpykbrhhyi7s582ikdhqis04"; + rev = "6a7a677c40fa3c348924a4e2a06a513e0b34c056"; + sha256 = "05m64vwi55kzknz9za0izc9hs1djc46467d7d8ijx3268sw3l0x6"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2023-08-10"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb"; - sha256 = "1rbfmxzfwbb2sqvcgzfhbkjz0w765psakaah7jp9rl72zjbnqy72"; + rev = "e85740d1a54ab0f10127b08c67a291053bc3acfa"; + sha256 = "0klmrkmhc3b52v7f03dvhysywixkh2zqqllq7sbrs278gnlxm2yl"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6168,12 +6168,12 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2023-10-20"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "901891484db3d46ce43d56871273dc7d40621356"; - sha256 = "1w8lrwjcnd8fs8b7mwm12vnbnfdmcpkm7p13b3hjv1fm7k2d8pca"; + rev = "009328955066ae6c170d24bb0de5f168d8760ff8"; + sha256 = "1i6lkbq5iadn9as9fy9lw1m1aw3vj00j6hxrrflgpnf3wqkvxb6a"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6241,12 +6241,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-11-05"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "328e8e40eacb2b5b0ea9c1e480644e768dc37df1"; - sha256 = "044zrhjmkxj1as4h91jpwmfjdbdl2bmcflzd3zm4lyyydb8rcxpp"; + rev = "6f4b11212ef7a83889a3b488f562242198ddae4a"; + sha256 = "00h283dx9k9bdd89379q200h5kg7x02fk7cb6fac6ybnnbvp53pm"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6301,12 +6301,12 @@ final: prev: neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "2023-08-25"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "81d2265efac717bb567bc15cc652ae10801286b3"; - sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4"; + rev = "c969a5b0073f2b5c8eaf017d1652f9251d761a15"; + sha256 = "0vjbc6sj9d4l8553g10wqxqpjr8z064g143i4ig4d42vsxh24ccc"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; @@ -6577,12 +6577,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-10-26"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "e32701cd26c590be614fc85d7cf36c9994c3a936"; - sha256 = "1j3n1mj680nh2r8za16ridngd3bd31jik5b6wxjs02g4zvwp6cr7"; + rev = "2bcb6b761a34c69739da9aab642839b59236b801"; + sha256 = "1pd2qzc3gvrbwhxd5i2bc5jd1ll762m23qsjpbhc4xm5dyq66i89"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7224,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "b0852218bc5fa6514a71a9da6d5cfa63a263c83d"; - sha256 = "05qi1yiawvl4nj867q9fh6v9aaafxypx3md00dx5mhcg9jy5hchs"; + rev = "90a28fd7637b66e055af62387ecee06f7cbd3173"; + sha256 = "0vzvbw8fh2j1l1sjkk5dfj5l5yghp5fk9pparvar1cyadpa6mcsh"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7380,12 +7380,12 @@ final: prev: nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; - version = "2023-10-15"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "ojroques"; repo = "nvim-osc52"; - rev = "5689dc08ee1ade3feb7f74bdd6e539fba70f3064"; - sha256 = "0pq68f0rfvvxw3y9kkwhqxrlvyk8gjfn8i8a06pb7m9k91r2qm5s"; + rev = "89307570b3bffe115d8b6b6fd3a4066cde0ba2d7"; + sha256 = "0alsh1r6c5b8zf3jcymmrp921mmmhvws38ih9hbw5yffcy0lqhl2"; }; meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; @@ -7452,12 +7452,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "5af95a6ce8494edb5182b13d140b93dc186a7fa1"; - sha256 = "1ib3azimg2h6v9k91sdppz4s11m44iw579cy54l76fffarpabnkk"; + rev = "c9b5422a845bff25ddeb8057b42afbf0f7b25e32"; + sha256 = "08x62lpjir0zhmscln14id0lz59wqmvdixacz7z9ghi00r7lrwxf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7476,12 +7476,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2023-11-10"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "815895f3158878d6ef79a167b2f4e7bfe0342393"; - sha256 = "1s5p5q26yl6zp6cqpz4ymgdc5fb6900nf3gxsx3hc6j1ll94zhx4"; + rev = "9192f310afe34ab925d61add187a5ff278879333"; + sha256 = "1wcw0xjh44ik1j9gaalrwl86d7mp4v5hcdas3qy3bg8w8aqvgwaw"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7500,12 +7500,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-11-10"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "3eb207fcafb6522e1ed531d760af3ef896cce030"; - sha256 = "0salsb05vwc72wmghyhw9v12pf000f19hjdivspl3fnp3ksygjf6"; + rev = "07201e6bd3b43a193d891cec844dfd1f23e775d1"; + sha256 = "0rpp9ddyq7yd462mlf99khrpway04vi892538ss8zqmz2lazchrn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7524,12 +7524,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2023-10-22"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "4f0e1f470595af067eca9b872778d83c7f52f134"; - sha256 = "16q85dd79rdn1v7wqshzhjgrsgbnzk04l4vjgp6g9hbj8p8sna4k"; + rev = "cfa2da7f469f1e759f2a961bc25fa4ccfe1795c2"; + sha256 = "0r1nm8l736vvrxhqnszk65siphkn59473y88qahxzhfj4b98qgd3"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -7572,36 +7572,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-11-09"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c"; - sha256 = "1s8y0k8qj1skxa7q5j53wisv6j63104ysvvyfd1p8mbw8f00xq83"; + rev = "874ae6e9445a5eb5ba430e5fd10212450a261ad7"; + sha256 = "0dn56zpbjxggcsbm7z6f1b4kcwsspj09ynzjkl8bq0l45qf3v50i"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-11-10"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "04a9a90c2a60c86aa9451c539586326b337b03e5"; - sha256 = "072kziq27h3iz8byh6awyz4q8kf05cnmxb3vs88x9nhflwvlfd68"; + rev = "075a64addc33390028ea124a1046a43497f05cd1"; + sha256 = "1rkwc97h9pnxrzqq1bp72cr6182rvh0bi3c9dfq91q51g70a651h"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-10-28"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "2806d83e3965017382ce08792ee527e708fa1bd4"; - sha256 = "0pk6pvqq8xm3jspq7zpkh7rpqdammq1np3gc5x1kjly0q11rf5pn"; + rev = "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977"; + sha256 = "0jx97czy9rywvaqbdbx4sb60yhiq50lw80xhm80vgrb1587lkciv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7680,12 +7680,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-10-12"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "92e688f013c69f90c9bbd596019ec10235bc51de"; - sha256 = "1wfaqq7gfkpf8jf8calin0ycy3hjvylh945bvlacv4zjnq9c3n2m"; + rev = "6c30f3c8915d7b31c3decdfe6c7672432da1809d"; + sha256 = "15iq4ascb384q39ib8gvn5kbqwg99rdp3qfm2pqkgl4ycsnczp1s"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7715,12 +7715,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-10-18"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "ebbab711d909d5f675e38ad489765bd22bd2c6b3"; - sha256 = "0cay5nznhry9g716pj7vzkyk58aagwqmbrysss8jfvwsx3pb93lg"; + rev = "068053c5921b04d4ecb5fafc2e71b4f04cc35e80"; + sha256 = "08kgrmcxv3rcf8lmvh4fif5njicvsirgsb8v48zhcg1ppn36c412"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7739,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-11-09"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "47103b80c38c59f7a1b5408c232b92bf5d018651"; - sha256 = "1lw7zf5qf6rdw9cnwxbim43f5a99spc4ic884s53yw1g75y3wwv7"; + rev = "3fafeea5f339223e888fd15eb4032260849cb038"; + sha256 = "14vwqj74icbh1zk23k833jfprh4bdb7yq850c4rn7cs6bl06nwrp"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7920,12 +7920,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-11-02"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "3fb972ee2a835c1b83199c9dbb3661f36e472c97"; - sha256 = "0h5fam6rhyh9nxnimp70w88w1h5qas37c7rlna27zhllvayp6gq9"; + rev = "f3a7349156453500f1c053a1f8034a3975b1d793"; + sha256 = "0xr665dmv8h87c681f114d3vmb9rh0g7map5m70gixdnd60v009p"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8065,12 +8065,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2023-03-28"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "4d98c8cc90d970d87c472c04bf7ca712336cc753"; - sha256 = "1wk9s1240f3vlyxi0xy97vkp3xz3r27582knav3zd6wrhqhih25r"; + rev = "18f8126dd8e65b2e21804c9107785af4abbb5bfc"; + sha256 = "0b9s9a3nz0449sl8zzf55xk12hrkksvnrnbc38i1la234xhrfpsw"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -8511,11 +8511,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-10-29"; + version = "2023-11-11"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "df8cdf68234fbf056202a9684931c3dfa89988c1"; - sha256 = "03hmkdkny3rfhprjimxala058b31das66iqzkghm99jw7mbrd4xc"; + rev = "a5e8fb4960f905a52031b28113cf43088cfeae22"; + sha256 = "0d3yfy7a7jc0g4y3x6fff2skbkhp3hjjk0p4q2a66s6rm626pg6z"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8762,12 +8762,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-11-06"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "a355a08d566aaac33374e24b12009cbe0f6a5b90"; - sha256 = "1n8m4icv3ilzdw1la9zbak4x7pn96w0fvwm5qxja3vrz20ir05hm"; + rev = "36cbeceb6602ce97f04d5526fd238957b77dd263"; + sha256 = "108zzz088ll08h55ij0bb81ak53cyxbzfigkfvj31c8v2i3j9jr9"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9051,12 +9051,12 @@ final: prev: snap = buildVimPlugin { pname = "snap"; - version = "2023-11-06"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "d4921fcbc2de5d3663747688555dc0379ce4c41b"; - sha256 = "0by1p0aid5rg2wlh7alyshs01q70f6k7v7nkc985c38ag4bsnl24"; + rev = "8a2c15665fab760ecfd854329d2170a6ab40aa83"; + sha256 = "0b9zd8v8l2d89wsc8qfgk51pqs8wrfr6fj9vcdq2v7f648ly19lw"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -9896,12 +9896,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2023-06-03"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "3dec002ea3e7952071d26fbb5d01e2038a58a554"; - sha256 = "1331qgsfxy1qsvxlkss2g713qlj2ri02ywbhiwwy5cyl8bc0rl76"; + rev = "a3dcb6e32a3a59a5570a7cda33171eeef9753345"; + sha256 = "1vx3zfb2mc56ggk1j2kh9xzpnid963wvg2ibhq1c7vzf0d3wigc0"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -10005,12 +10005,12 @@ final: prev: term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; - version = "2023-07-30"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "929c45441adc5798d382caa50f4e5158e2097765"; - sha256 = "0ggr9rg10r7hrai9rz89sa301z9pib0g6mav6byrxfnw1kww16xy"; + rev = "aa3369a562b816ff0cec4fa6eddc9c32ac472710"; + sha256 = "07fd9xqg2ykqnsqb9w6jqypzzl8klih5d67gi42jdawj3n4ijvcs"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -10065,12 +10065,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-11-08"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "4df09daa30d2c58bc7baefce1428ed84e2f0fbc3"; - sha256 = "0754x0x1bqk6yn51qdnl8mrv6pc0rn1jqgmcrn0s00jsl1nbpims"; + rev = "51e043c27478823d3d914ccf8e373b189a084836"; + sha256 = "1fggk1k1wfgrcapv2z8s7j9k1nkxc1g33c87pjld7dsm6477fvms"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10378,12 +10378,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-10-25"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "2fddf2beeec265e0a41dd24ac668d825f8f3657a"; - sha256 = "0arxrf5lrqp31l9118wmsfjniabb5l113h7wc19s8j6fzdldgs0q"; + rev = "e72561f0023860eb83bd7680573b05ecfc016c55"; + sha256 = "1i9ydjr9fzhwxf55451p4i0l4mnflp9gziyxz7z5w06qa1ya7cvd"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10402,12 +10402,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2023-10-30"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "170aa9e516b6926e6bddfe21bbf01f2283a00e7d"; - sha256 = "1akmajm1fvf3dr0jm3n0f2qxana8lqi3k4wvrqn65h00g4ks6nd3"; + rev = "36ff7abb6b60980338344982ad4cdf03f7961ecd"; + sha256 = "1rjz58ggkrz0pfrbiq93p2zq4bif2m7rjn9jj8hbqikmp8g7h19g"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -11362,12 +11362,12 @@ final: prev: vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; - version = "2023-07-18"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "d05d1ab602048fc13fd8cc70cd722c083b0fd904"; - sha256 = "1v0117rahgs2ap650xcqv48xmw2yk5qiz6rfny7q0vz9pvy9p1s0"; + rev = "8def3d890b2087ee4c42af03117d7edc7d693706"; + sha256 = "129mrz3jxw4kgbg5lz9gc7rznsjp2fbjvi60zyrpkmv8xa6yhmpw"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -12250,12 +12250,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2023-11-10"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "6efb835aa2de69daaf164e1605decf4987609889"; - sha256 = "1qggjby8878ggcvgwjzfzx673fmn6gcamfwj2a00vpsrk8banqmh"; + rev = "fe0e8a2630eef548e4122096e4e2241f42208fe3"; + sha256 = "1lzhkqr74z430zm61jy4hmrxv3nq89rhrpzlp8fj9vwfkbqpzrgm"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -13092,12 +13092,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-10-16"; + version = "2023-11-11"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "c58edb98f09a650612adaaf8c47995c9e2b7ffb1"; - sha256 = "0y839rrk5i3f6wmk94p28yy3alq5jnh8124v51prmzirzyhirhh1"; + rev = "ee2bb88833766ed184a77d4caa1e43d0821eaeb2"; + sha256 = "1bq745cx1ybzi84zjm6lj3mzy4bz5id5fs07jkvipakdpp44bxsa"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13741,12 +13741,12 @@ final: prev: vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2023-02-24"; + version = "2023-11-10"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "d4fc6f8234c37eef16b6de8055c5fe53b7d7316a"; - sha256 = "03papfmlyrn410c7dflwbxinwymlvizdmwvyvrg24gdxc5vvp24q"; + rev = "84ff781925a28346df99d3764ec697c3088862a7"; + sha256 = "09lswvc5s97brx6iimkbqslmsmbb19nz0s6w0hpss8vf0fy38a8l"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -15194,12 +15194,12 @@ final: prev: vim-vsnip = buildVimPlugin { pname = "vim-vsnip"; - version = "2023-09-15"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "be277461265f1e5c7db470aa479f30956597ea9e"; - sha256 = "0fiqz7qrcsla2ms5lfw0w8f6ysa5wivnhjn9463i00vasg19mcqi"; + rev = "8eebdf6ab4a880d845893f210fd20516d2e2384f"; + sha256 = "10aadjkisfsx4avylblp7zb97ikaay249fzw3f43xgknlajg35dg"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -16024,12 +16024,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-11-04"; + version = "2023-11-12"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "d7521f6050b94cb0e23067f63829d86886f870fe"; - sha256 = "0rajb128dxdlbm0fhg5d6v5hhv1a9x6jik87bzdfr964jws05hg9"; + rev = "9f3c13bbcf16fcaec3a429c03743a13e5923f3e3"; + sha256 = "06m4mz3s53n5rw62jdrz66ygfqx02r0m7ixb14cl327hy1dfnsgc"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 595601e56e3..4f00a46348c 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -138,12 +138,12 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=ffe6c2f"; + version = "0.0.0+rev=10bacac"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "ffe6c2f3dbf30224479a28ca5d50df594b2486a9"; - hash = "sha256-K9z533lsurYMznmHeSKfqpy5KfE2/NpqP9bpLrA+pLw="; + rev = "10bacac929ff36a1e8f4056503fe4f8717b21b94"; + hash = "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; @@ -835,12 +835,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=ae8aa51"; + version = "0.0.0+rev=7e02322"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-groovy"; - rev = "ae8aa51ec3275afb567a4a67df1a26d89feb135f"; - hash = "sha256-K9XoSVuAWXJCTxclod4pfxnGHhsbtdE7Xi60wfuCE8M="; + rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec"; + hash = "sha256-tWLc5guc5dxKHoACN3Byo/KV+2i/u2tpZgaS+Yi+CyA="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; }; @@ -1033,12 +1033,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=77f8418"; + version = "0.0.0+rev=51271e2"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "77f8418fdba7b402350e4817bbb54816bbc627d2"; - hash = "sha256-WnJ5RvPZx/+BkaOoTHV/yZQ+HFf60Nj9xoylt+3AgqA="; + rev = "51271e260346878e1a1aa6c506ce6a797b7c25e2"; + hash = "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1231,12 +1231,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=cff1fea"; + version = "0.0.0+rev=b35882f"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056"; - hash = "sha256-WWq7aLFqjHnNe280u4+4SuqD+x73ww75fAE/Zm5ttAs="; + rev = "b35882f2e1460867ddddcbe8af586e6807d4676f"; + hash = "sha256-N7mZrTzIqh55ogttm4T2O7uPFKbJd2odWDUWYfQz0F0="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1319,24 +1319,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=cd705f1"; + version = "0.0.0+rev=7ce4c69"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94"; - hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw="; + rev = "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"; + hash = "sha256-UxpTkiRChAwNJBVS9y/lydI8R035EuRy3t39Y1mscq0="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=cd705f1"; + version = "0.0.0+rev=7ce4c69"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94"; - hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw="; + rev = "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45"; + hash = "sha256-UxpTkiRChAwNJBVS9y/lydI8R035EuRy3t39Y1mscq0="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1777,12 +1777,12 @@ }; pymanifest = buildGrammar { language = "pymanifest"; - version = "0.0.0+rev=8953f91"; + version = "0.0.0+rev=a775470"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-pymanifest"; - rev = "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae"; - hash = "sha256-1kG09tYE9FAxsE4MqLadi4dtqtJOFOZGOOVgnqvWc44="; + rev = "a77547018ada84ca4bc115c7650b19441120f065"; + hash = "sha256-8aU3TA0KJAfsiJi326mixw6GcnFDTJzrHquCZi0lYOQ="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pymanifest"; }; @@ -1909,12 +1909,12 @@ }; requirements = buildGrammar { language = "requirements"; - version = "0.0.0+rev=eda424e"; + version = "0.0.0+rev=389dd46"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-requirements"; - rev = "eda424eade0f2afbafbf0c89d18c77818fa19273"; - hash = "sha256-cZjj17316Cnz/A+7K3f81H/iedrlu0IDTdDLkXThcnQ="; + rev = "389dd46a39075ce36af6ee3af50393d9aa506d14"; + hash = "sha256-SGamdYeoBKMkyVzvA4nCWp3bqhfmkJctyhcVhqYBfPQ="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; }; @@ -2121,12 +2121,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=25be0b8"; + version = "0.0.0+rev=5f928f4"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286"; - hash = "sha256-ztiTMusfPkCpzqiEQt+HmkLt6gDhHt6dBdjIOb4ZBxs="; + rev = "5f928f404d2aa024abce8657778fc10c03f1511f"; + hash = "sha256-7W6vuaZjDZgoaxJexPPBjJZlutlTT+hTFL1dq9k2NSo="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2580,17 +2580,28 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=a30e8ec"; + version = "0.0.0+rev=238200d"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05"; - hash = "sha256-B0XQ9C70AsbtDXZfZUcuoQf26rbiPcQrHrobrKjT+FM="; + rev = "238200d172538d5ff1228a929ea543465acfc410"; + hash = "sha256-a/8lbO8/+XhD3i6hjAxCA1rpovlkVHnDxz8xkc3bPoY="; }; location = "libs/tree-sitter-wing"; generate = true; meta.homepage = "https://github.com/winglang/wing"; }; + xcompose = buildGrammar { + language = "xcompose"; + version = "0.0.0+rev=01344fe"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-xcompose"; + rev = "01344fed31a3cd37a63f03357ec80cbc592a93b5"; + hash = "sha256-MZmtV8d5L7qF65cJuxZaJwMVvxSYMduwv8lbzljMJLM="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; + }; xml = buildGrammar { language = "xml"; version = "0.0.0+rev=a3bfa1a"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index dcb2eea0130..5e6f03ec8ce 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1040,12 +1040,12 @@ self: super: { sniprun = let - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; - rev = "v${version}"; - hash = "sha256-Lh4S7n+bNbdzjDt4lAL271VeYO3cotMD/kbAbV20C0U="; + rev = "refs/tags/v${version}"; + hash = "sha256-xQb/VZOuwB1J4m6iOs1JMfH1f1rOzJzpvq3D4HHOHAI="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; @@ -1055,12 +1055,7 @@ self: super: { darwin.apple_sdk.frameworks.Security ]; - # Cargo.lock is outdated - preBuild = '' - cargo update --offline - ''; - - cargoHash = "sha256-N+Okln3irqevUHC+ZUDQgQXhJ767peKMmsnt/sT77o8="; + cargoHash = "sha256-6h0P0UVks6dQz2PZ1A/CLa1T8okD3CIUnfrH3vHe4L8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch index f3203e00757..85a6daceefa 100644 --- a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch @@ -1,5 +1,5 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index aa39e0b..188d54a 100644 +index c9b811f..459cf07 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua @@ -4,9 +4,7 @@ M.custom_highlight=false @@ -13,11 +13,29 @@ index aa39e0b..188d54a 100644 local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." +@@ -145,7 +143,7 @@ function M.setup_highlights() + highlight(group, styles) + end + vim.cmd('augroup END') +- else ++ else + for group, styles in pairs(colors_table) do + local gui = styles.gui and 'gui='..styles.gui or 'gui=NONE' + local sp = styles.sp and 'guisp='..styles.sp or 'guisp=NONE' +@@ -354,7 +352,7 @@ function M.health() + -- check if the log is recreated + if pcall(M.ping) then health_ok("Sent a ping to the sniprun binary") + else health_warn("Could not send a ping to the sniprun binary - is it present, executable and compatible with your CPU architecture?") end +- ++ + + os.execute("sleep 0.2") + if not M.file_exists(path_log_file) and not M.file_exists(path_log_file_mac) then health_error("sniprun binary incompatible or crash at start", {"Compile sniprun locally, with a clean reinstall and 'bash ./install.sh 1' as post-install command."}) diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh -index 2e6264d..0eab1c6 100644 +index eb51dbe..1382b5c 100755 --- a/ressources/init_repl.sh +++ b/ressources/init_repl.sh -@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe +@@ -35,7 +35,7 @@ mkfifo $working_dir/$pipe touch $working_dir/$out sleep 36000 > $working_dir/$pipe & @@ -25,7 +43,7 @@ index 2e6264d..0eab1c6 100644 +echo "cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh chmod +x $working_dir/real_launcher.sh - echo $repl " process started at $(date +"%F %T")." >> $working_dir/log + echo $repl " process started at $(date +"%F %T")." >> $log diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh index feaa91e..749c55e 100755 --- a/ressources/launcher_repl.sh diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix new file mode 100644 index 00000000000..ab7089e5199 --- /dev/null +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, + cmake, + pkg-config, + wrapQtAppsHook, + pcsclite, + qtscxml, + qtsvg, + qttools, + qtwayland, + qtwebsockets, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ausweisapp"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "Governikus"; + repo = "AusweisApp2"; + rev = finalAttrs.version; + hash = "sha256-RUjc4KqyKZXBW+CMaRhKsbwVzmWw6/QHNK+RpBd7Gxw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + # The build scripts copy the entire translations directory from Qt + # which ends up being read-only because it's in the store. + preBuild = '' + chmod +w resources/translations + ''; + + buildInputs = [ + pcsclite + qtscxml + qtsvg + qttools + qtwayland + qtwebsockets + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version"; + }; + + meta = { + description = "Official authentication app for German ID card and residence permit"; + downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; + homepage = "https://www.ausweisapp.bund.de/open-source-software"; + license = lib.licenses.eupl12; + mainProgram = "AusweisApp"; + maintainers = with lib.maintainers; [b4dm4n]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix deleted file mode 100644 index 6ef313fa6de..00000000000 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets -, qtquickcontrols2, qtgraphicaleffects }: - -mkDerivation rec { - pname = "AusweisApp2"; - version = "1.26.7"; - - src = fetchFromGitHub { - owner = "Governikus"; - repo = "AusweisApp2"; - rev = version; - hash = "sha256-i9hfmMp0pEqtIeKc1mcyINXetzD/33aM0utL8nomVcg="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - # The build scripts copy the entire translations directory from Qt - # which ends up being read-only because it's in the store. - preBuild = '' - chmod +w resources/translations - ''; - - buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; - - meta = with lib; { - description = "Authentication software for the German ID card"; - downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; - homepage = "https://www.ausweisapp.bund.de/ausweisapp2/"; - license = licenses.eupl12; - maintainers = with maintainers; [ b4dm4n ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix index d95df54bb4c..31880f99a0c 100644 --- a/pkgs/applications/misc/krabby/default.nix +++ b/pkgs/applications/misc/krabby/default.nix @@ -4,14 +4,14 @@ }: rustPlatform.buildRustPackage rec { pname = "krabby"; - version = "0.1.7"; + version = "0.1.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YI8OkNIDZWxAV+9n8AbKdZuWdA3A2cD94DuPgFvkokE="; + sha256 = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; }; - cargoHash = "sha256-j4zCuPmn/+ZSLFkAivNs3lH7YWVLvLA9k9RKbh43tUU="; + cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4="; meta = with lib; { description = "Print pokemon sprites in your terminal"; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index 178265aeb73..59c0b6eb8fb 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJCTISXN098A8CB34HM12WgdiSMNA31NO2x7u+iSwBM="; + sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index c144704fa13..a4796d93954 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.5.0"; + packageVersion = "11.5.1"; applicationName = "Floorp"; binaryName = "floorp"; version = "155.4.0"; @@ -17,7 +17,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-adK3LAu3cDh6d+GvtnkWmSnxansnSZoIgtA9TAqIMyA="; + hash = "sha256-988jKyfIGZ2UPHTNO1cK2lxR/5j3U/QYR3ZI9WsvHUI="; }; extraConfigureFlags = [ diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 1c2ac1f8d5f..d034c68d85f 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "118.0.2088.76"; + version = "119.0.2151.44"; revision = "1"; - sha256 = "sha256-cd8W/0UZi+NhPSILR8e8aOLxy6ra+0DVwRowo2jG8DA="; + sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; }; beta = import ./browser.nix { channel = "beta"; - version = "119.0.2151.32"; + version = "119.0.2151.44"; revision = "1"; - sha256 = "sha256-tsDFUKZDiusr/fGO5NMRqzTDIF+MTgC/1gJu95wXwAw="; + sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; }; dev = import ./browser.nix { channel = "dev"; - version = "120.0.2172.1"; + version = "120.0.2186.2"; revision = "1"; - sha256 = "sha256-EvTS0AO3/A8Ut9H36mMOnS9PRR062WAoas9/Pd90NBM="; + sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; }; } diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 2f00e4de0c8..2bb15a79b94 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.83.13"; + version = "3.85.17"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.83.13-build-231024j9x7ova5e.AppImage"; - hash = "sha256-ZuwPLYcVcjCCLdWSarY0oq0GUDiOrvNBgK/7ETb8OLg="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.85.17-build-231109zg8yl8v6s.AppImage"; + hash = "sha256-sYdfN535Fg3Bm26XKQNyuTItV+1dT3W/2HGH51ncEM0="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index b570c5bb53f..a18afedaecd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.37.0"; - hash = "sha256-oPW2YHyYsbTvQ+8VQtaubBki7w2wd1tlgVmPL5v5E5s="; + version = "6.38.0"; + hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.38.0-beta.1"; - hash = "sha256-DZXqq4AD1arP+o5xbuR8yD5By5VPBtClchScZb2Nb1U="; + version = "6.39.0-beta.2"; + hash = "sha256-1+1wvkMtEovBBs2bS9zUV5kpSxkPy0EqBAU01el8uko="; }; } diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index c29db89f0d7..e507692d622 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.5"; + version = "0.65.6"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-NdBs/WyN1WDOJ5tnIYPtQTAm4EdVJj1HXm2KIjOKC7E="; + hash = "sha256-sI2DqhR9LmXxjkkMTDiMG/f/QXcBVPmEjbHFsmEP8qE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index d81470be047..1303afb9d66 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.10.1"; + version = "23.11.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-+BtzN+CdaxriA466m6aF0y7Jdvx1DGtSR+i6gGeAxSM="; + hash = "sha256-rsYB8aLVVpGGbiEDWCpGCPdZEsOajoGfoh6YYxilxpg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch deleted file mode 100644 index 1cef96ea140..00000000000 --- a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/scripts/makedbh b/scripts/makedbh -index 01e4fa5..d6299c6 100755 ---- a/scripts/makedbh -+++ b/scripts/makedbh -@@ -1,4 +1,4 @@ --#!/bin/csh -f -+#!/usr/bin/env tcsh - # - # makes the "database.h" (1st argument, $1) file from "database.h.in" - # (2nd argument, $2), setting various mask operation definitions diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index fc68969bd49..c816b356267 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.277"; + version = "8.3.447"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY="; + sha256 = "sha256-t/gJ43VIdBIiozLfqaTy7tJsXK674gWBbW1aPHKEj3U="; }; nativeBuildInputs = [ python3 ]; @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; - patches = [ - ./0001-strip-bin-prefix.patch - ]; - meta = with lib; { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix index 1efab8e0271..5a3a41e05b0 100644 --- a/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-IIvpUKJxeJYKmTSzEEMZPV6JElt6Ww/Whx3ytNcha7k="; + sha256 = "sha256-ff8n8SkeppZzJO58OrPQJ0MInZCIz8nTb7lmiCC0ATg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/bk/bk/package.nix b/pkgs/by-name/bk/bk/package.nix new file mode 100644 index 00000000000..9741278bb18 --- /dev/null +++ b/pkgs/by-name/bk/bk/package.nix @@ -0,0 +1,38 @@ +{ fetchCrate +, go-md2man +, installShellFiles +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "bk"; + version = "0.6.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y="; + }; + + cargoHash = "sha256-pE5loMwNMdHL3GODiw3kVVHj374hf3+vIDEYTqvx5WI="; + + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postBuild = '' + sed -i '$ a # Source and further info' README.md + sed -i '$ a https://github.com/aeosynth/bk' README.md + go-md2man -in README.md -out bk.1 + ''; + + postInstall = '' + installManPage bk.? + ''; + + meta = with lib; { + homepage = "https://github.com/aeosynth/bk"; + description = "A terminal epub reader written in rust"; + license = licenses.mit; + maintainers = with maintainers; [ vuimuich ]; + mainProgram = "bk"; + }; +} diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 38ad126e5ce..d84cb848cc7 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-9EGoJ5DoGgVfbhCDeTvn1D7misJEj9jPwuiOK7z95Ts="; - aarch64-linux = "sha256-lO0YOSiO8AUrkbV+3Uyvg6p3bdAcTze3La2g5IcK1f0="; - x86_64-darwin = "sha256-WjvC3pt8Gd4q+BzrOhyGeYwZIbv2m5O3pSXe1N7Najw="; - aarch64-darwin = "sha256-IRm5m/Jaf4pmAzx+MXwmHLejo6Gv2OL56R1IEr/NlZU="; + x86_64-linux = "sha256-6dbgmYyXOUuWGOFXcO9eEZVoRjRLWK906SJh27wZ+PY="; + aarch64-linux = "sha256-cO1+ZVXC25zO5msU6Nbp29vkkNFRQ2jKSxtCZw1H104="; + x86_64-darwin = "sha256-3KMSoFQz7kYinD4QbS82dIq6UDetfdky6ClIfP83ISg="; + aarch64-darwin = "sha256-bj8PVJ4pfrNXo1yn5UbkHflskZMS61+LM9hi9mtdXtk="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.2.104"; + version = "1.4.16"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix index a6f23e10bce..7787bd4ccf8 100644 --- a/pkgs/by-name/gi/gitmoji-cli/package.nix +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "gitmoji-cli"; - version = "8.5.0"; + version = "9.0.0"; src = fetchFromGitHub { owner = "carloscuesta"; repo = "gitmoji-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZM6jOi0FnomkIZeK6ln1Z0d6R5cjav67qyly3yqR1HQ="; + hash = "sha256-cIc0AaP1AwhoVJLnonC9qvDWNZW4L6/jsQ3Q6z5VXI0="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-HSAWFVOTlXlG7N5591hpfPAYaSrP413upW5u/HN9X2o="; + hash = "sha256-HXMRCTiUti/GZ1dzd+XbFOao3+QLC1t7H0TT9MS5lz4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix new file mode 100644 index 00000000000..aab0ab3d635 --- /dev/null +++ b/pkgs/by-name/go/go-judge/package.nix @@ -0,0 +1,36 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-judge"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "criyle"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iKSOD/jh7NgGUNeQxFqlZDcctUXBDC1Tjxsm0Q2iZ3I="; + }; + + vendorHash = "sha256-GVsRflqqt+PwVGWaNGMH4prKQ5pWqPRlsTBJZtC+7zo="; + + tags = [ "nomsgpack" ]; + + subPackages = [ "cmd/go-judge" ]; + + preBuild = '' + echo v${version} > ./cmd/go-judge/version/version.txt + ''; + + CGO_ENABLED = 0; + + meta = with lib; { + description = "High performance sandbox service based on container technologies"; + homepage = "https://github.com/criyle/go-judge"; + license = licenses.mit; + mainProgram = "go-judge"; + maintainers = with maintainers; [ criyle ]; + }; +} diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index e891fe01f31..a53a4dddda5 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-c5R5V5J1ETBl6JAdNDSxa94OeMyqbTAUmJHJCo1B+WQ="; + hash = "sha256-AXa+K+njXkrJeqABD04WHpmvAzAL1Mw11ZhCfFNJxhY="; }; - cargoHash = "sha256-D/WKv8rhb/ZGuVEZDp83PZxJydHbnZUQp+kVNlMBUCs="; + cargoHash = "sha256-tNuv+D75wox3HlUZSJJ67KEBKmGJXBkXHfvDsNHeM6A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index d2f8a4cec2f..4cd0658f3ac 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.26"; + version = "1.1.27"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-hDXqUjJXQqEpaGCdfxGuAnUraB5/RjZB4MmomAG4aPM="; + hash = "sha256-aMoL125DjXM/HL+ebCkjywwEv1VTKPmF2CV/TJd1LMU="; }; - npmDepsHash = "sha256-uq3HbmkeJl3A46/rfm29v+oXFnZOwp2SFArm6Wtv+wo="; + npmDepsHash = "sha256-i1tbHCI/z/kiGIROlVMvnt7x4f8D7pzTk1BcSPFDwFw="; dontNpmInstall = true; diff --git a/pkgs/by-name/pi/pioasm/package.nix b/pkgs/by-name/pi/pioasm/package.nix new file mode 100644 index 00000000000..4deb07ab3ac --- /dev/null +++ b/pkgs/by-name/pi/pioasm/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pioasm"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = "pico-sdk"; + rev = finalAttrs.version; + hash = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU="; + }; + sourceRoot = "${finalAttrs.src.name}/tools/pioasm"; + + nativeBuildInputs = [ cmake ninja ]; + + installPhase = '' + runHook preInstall + + install -D pioasm $out/bin/pioasm + + runHook postInstall + ''; + + meta = with lib; { + description = "Assemble PIO programs for Raspberry Pi Pico"; + homepage = "https://github.com/raspberrypi/pico-sdk"; + license = licenses.bsd3; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + mainProgram = "pioasm"; + }; +}) diff --git a/pkgs/by-name/ra/raft-cowsql/package.nix b/pkgs/by-name/ra/raft-cowsql/package.nix index a377f966241..f4e94d8f410 100644 --- a/pkgs/by-name/ra/raft-cowsql/package.nix +++ b/pkgs/by-name/ra/raft-cowsql/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "raft-cowsql"; - version = "0.17.7"; + version = "0.18.2"; src = fetchFromGitHub { owner = "cowsql"; repo = "raft"; rev = "refs/tags/v${version}"; - hash = "sha256-ZAUC2o0VWpC/zMOVOAxW+CAdiDTXa5JG0gfHirTjm88="; + hash = "sha256-CMcKXX2u+qiroleg5GIovTOVAg9ycXBsRDqfsOCL3yo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix new file mode 100644 index 00000000000..0a289e09897 --- /dev/null +++ b/pkgs/by-name/st/stats/package.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "stats"; + version = "2.9.11"; + + src = fetchurl { + url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; + hash = "sha256-L7E3naVeFYxeS8OAEkXEgY7YB+6E+yrGfIAUr52EWvA="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "macOS system monitor in your menu bar"; + homepage = "https://github.com/exelban/stats"; + license = licenses.mit; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix new file mode 100644 index 00000000000..4b78fa9b9ce --- /dev/null +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, undmg +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "warp-terminal"; + version = "0.2023.11.07.08.02.stable_00"; + + src = fetchurl { + url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg"; + hash = "sha256-oGsoIzNlrknaZtrGWT3oUEzwJIutxB1wnAvxTzF6Fis="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + meta = with lib; { + description = "Rust-based terminal"; + homepage = "https://www.warp.dev"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 0e097ed347d..6baf519b8af 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.58"; + version = "2.9.59"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-/dt4xwUZrvymCpc3xRyWM2Wsh7zk7ndepgOWJwJ2Das="; + hash = "sha256-2eb31qV49r8U4arj4TuA+lyi9HTBPRgmW3vR+qF6QfE="; }; - npmDepsHash = "sha256-9GBhC2PQyaqi64ncIuMZSf9CLB8l+cywT7QTzW9WiTs="; + npmDepsHash = "sha256-HkBcizAao4uV+EDJc3z8P97ivMhbYr27hwY7x2jqEIc="; dontNpmBuild = true; diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index 29569d1137a..895e70a544b 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.139"; + version = "1.141"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; - hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs="; + hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; stripRoot = false; }; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index f8ffc6a2b8e..059350da7d4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab # rename to more standard names + # handle broken macOS file-system mv andalemo.ttf Andale_Mono.ttf mv ariblk.ttf Arial_Black.ttf - mv arial.ttf Arial.ttf + mv arial.ttf Arial.ttf.tmp + mv Arial.ttf.tmp Arial.ttf mv arialbd.ttf Arial_Bold.ttf mv arialbi.ttf Arial_Bold_Italic.ttf mv ariali.ttf Arial_Italic.ttf @@ -51,12 +53,15 @@ stdenv.mkDerivation { mv courbd.ttf Courier_New_Bold.ttf mv couri.ttf Courier_New_Italic.ttf mv courbi.ttf Courier_New_Bold_Italic.ttf - mv georgia.ttf Georgia.ttf + mv georgia.ttf Georgia.ttf.tmp + mv Georgia.ttf.tmp Georgia.ttf mv georgiab.ttf Georgia_Bold.ttf mv georgiai.ttf Georgia_Italic.ttf mv georgiaz.ttf Georgia_Bold_Italic.ttf - mv impact.ttf Impact.ttf - mv tahoma.ttf Tahoma.ttf + mv impact.ttf Impact.ttf.tmp + mv Impact.ttf.tmp Impact.ttf + mv tahoma.ttf Tahoma.ttf.tmp + mv Tahoma.ttf.tmp Tahoma.ttf mv times.ttf Times_New_Roman.ttf mv timesbd.ttf Times_New_Roman_Bold.ttf mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf @@ -65,11 +70,13 @@ stdenv.mkDerivation { mv trebucbd.ttf Trebuchet_MS_Bold.ttf mv trebucit.ttf Trebuchet_MS_Italic.ttf mv trebucbi.ttf Trebuchet_MS_Italic.ttf - mv verdana.ttf Verdana.ttf + mv verdana.ttf Verdana.ttf.tmp + mv Verdana.ttf.tmp Verdana.ttf mv verdanab.ttf Verdana_Bold.ttf mv verdanai.ttf Verdana_Italic.ttf mv verdanaz.ttf Verdana_Bold_Italic.ttf - mv webdings.ttf Webdings.ttf + mv webdings.ttf Webdings.ttf.tmp + mv Webdings.ttf.tmp Webdings.ttf install -m444 -Dt $out/share/fonts/truetype *.ttf diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 1d7ed664097..04f89b6d2a1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.3.4"; + version = "27.3.5"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-JsK2jzXyAACh9e3P2y0YLky2XQuR/dKyEbRpFUSnJdM="; + hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I="; }; - npmDepsHash = "sha256-uchJ+1NWbo4FpNOjOO3luhIdZyQZLToZ1UCMLdGzjkY="; + npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 25923f3cfc7..1a6537a0096 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; - version = "7.2.96"; + version = "7.3.67"; src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM="; + sha256 = "sha256-gQT+5MqYo1qUiLJTzlhF5dB5BZMtr34JWn9rMa9MJvQ="; sparseCheckout = [ "fonts" ]; }; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index e9fd74c9222..f266c480913 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -23,6 +23,7 @@ , gnome , gsettings-desktop-schemas , gsound +, gst_all_1 , gtk4 , ibus , libgnomekbd @@ -134,7 +135,11 @@ stdenv.mkDerivation rec { tracker-miners # for search locations dialog udisks2 upower - ]; + ] ++ (with gst_all_1; [ + # For animations in Mouse panel. + gst-plugins-base + gst-plugins-good + ]); preConfigure = '' # For ITS rules diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix new file mode 100644 index 00000000000..14d7d215a00 --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, ncurses5 +, python38 +, libxcrypt-legacy +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "13.2.rel1"; + + platform = { + aarch64-darwin = "darwin-arm64"; + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + sha256 = { + aarch64-darwin = "39c44f8af42695b7b871df42e346c09fee670ea8dfc11f17083e296ea2b0d279"; + aarch64-linux = "8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a"; + x86_64-darwin = "075faa4f3e8eb45e59144858202351a28706f54a6ec17eedd88c9fb9412372cc"; + x86_64-linux = "6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + done + ''; + + postFixup = '' + mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped + cat <<EOF > $out/bin/arm-none-eabi-gdb + #!${runtimeShell} + export PYTHONPATH=${python38}/lib/python3.8 + export PYTHONHOME=${python38}/bin/python3.8 + exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" + EOF + chmod +x $out/bin/arm-none-eabi-gdb + ''; + + meta = with lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak prtzl ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 834a30b3716..1caf96c715c 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -55,6 +55,6 @@ in stdenv.mkDerivation rec { homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 0a0af783236..efd7042c230 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -73,7 +73,7 @@ in patches = rustcPatches; # Use boot package set to break cycle - inherit (bootstrapRustPackages) cargo rustc; + inherit (bootstrapRustPackages) cargo rustc rustfmt; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 3a649bde95d..1550887c356 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,7 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , fetchurl, file, python3 -, darwin, cargo, cmake, rust, rustc +, darwin, cargo, cmake, rust, rustc, rustfmt , pkg-config, openssl, xz , libiconv , which, libffi @@ -24,13 +24,15 @@ let inherit (lib) optionals optional optionalString concatStringsSep; inherit (darwin.apple_sdk.frameworks) Security; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "${targetPackages.stdenv.cc.targetPrefix}rustc"; inherit version; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; inherit sha256; + # See https://nixos.org/manual/nixpkgs/stable/#using-git-bisect-on-the-rust-compiler + passthru.isReleaseTarball = true; }; __darwinAllowLocalNetworking = true; @@ -79,6 +81,12 @@ in stdenv.mkDerivation rec { "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" "--set=build.cargo=${cargo}/bin/cargo" + ] ++ lib.optionals (!(finalAttrs.src.passthru.isReleaseTarball or false)) [ + # release tarballs vendor the rustfmt source; when + # git-bisect'ing from upstream's git repo we must prevent + # attempts to download the missing source tarball + "--set=build.rustfmt=${rustfmt}/bin/rustfmt" + ] ++ [ "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" @@ -203,6 +211,14 @@ in stdenv.mkDerivation rec { # See https://github.com/jemalloc/jemalloc/issues/1997 # Using a value of 48 should work on both emulated and native x86_64-darwin. export JEMALLOC_SYS_WITH_LG_VADDR=48 + '' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) '' + mkdir .cargo + cat > .cargo/config <<\EOF + [source.crates-io] + replace-with = "vendored-sources" + [source.vendored-sources] + directory = "vendor" + EOF ''; # rustc unfortunately needs cmake to compile llvm-rt but doesn't @@ -281,4 +297,4 @@ in stdenv.mkDerivation rec { "i686-windows" "x86_64-windows" ]; }; -} +}) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 51e20936803..28f083c31b1 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -233,6 +233,9 @@ stdenv.mkDerivation (finalAttrs: { "test_sentinel2_zipped" # tries to call unwrapped executable "test_SetPROJAuxDbPaths" + # fixed and renamed in 3.8.0RC1 + # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 + "test_visoss_6" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index 33f174dfc71..08c35ec9409 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "5.2.2"; + version = "5.2.4"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-+OVfMXkBALT8v/30JU8v2gTsw12FM5n1I2COV/b5vGY="; + hash = "sha256-AAEk9gDxtlNDEG8B4HmOJ5Nd+GyWibT+yuMccylU8iQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 636b3ac2b0f..3674f25b465 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://roguecentral.org/doryen/libtcod/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index a18df6a4a78..a8aec285a98 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,9 +1,10 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, qmake , qtbase , qtquick1 -, qmake , qtmultimedia , utmp }: @@ -13,13 +14,15 @@ stdenv.mkDerivation { version = "unstable-2022-01-09"; src = fetchFromGitHub { - repo = "qmltermwidget"; owner = "Swordfish90"; + repo = "qmltermwidget"; rev = "63228027e1f97c24abb907550b22ee91836929c5"; hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ="; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + qmake + ]; buildInputs = [ qtbase @@ -28,24 +31,31 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.isDarwin utmp; patches = [ + # Changes required to make it compatible with lomiri-terminal-app + # QML-exposed colorscheme, scrollbar & clipboard functionality + # Remove when https://github.com/Swordfish90/qmltermwidget/pull/39 merged + (fetchpatch { + name = "0001-qmltermwidget-lomiri-submissions.patch"; + url = "https://github.com/Swordfish90/qmltermwidget/compare/63228027e1f97c24abb907550b22ee91836929c5..ffc6b2b2a20ca785f93300eca93c25c4b74ece17.patch"; + hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4="; + }) + # Some files are copied twice to the output which makes the build fails ./do-not-copy-artifacts-twice.patch ]; postPatch = '' substituteInPlace qmltermwidget.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" + --replace '$$[QT_INSTALL_QML]' '$$PREFIX/${qtbase.qtQmlPrefix}/' ''; - installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ]; - dontWrapQtApps = true; meta = { description = "A QML port of qtermwidget"; homepage = "https://github.com/Swordfish90/qmltermwidget"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; }; } diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 5af34139f93..e655645cd86 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -1,13 +1,28 @@ -{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch -, mesa, libGLU, glfw -, libX11, libXi, libXcursor, libXrandr, libXinerama -, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib -, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +{ stdenv +, lib +, fetchFromGitHub +, cmake +, fetchpatch +, mesa +, libGLU +, glfw +, libX11 +, libXi +, libXcursor +, libXrandr +, libXinerama +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsa-lib +, pulseSupport ? stdenv.hostPlatform.isLinux +, libpulseaudio , sharedLib ? true , includeEverything ? true , raylib-games +, darwin }: - +let + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL; +in stdenv.mkDerivation (finalAttrs: { pname = "raylib"; version = "4.5.0"; @@ -21,11 +36,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ - mesa glfw libXi libXcursor libXrandr libXinerama - ] ++ lib.optional alsaSupport alsa-lib + buildInputs = [ glfw ] + ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; - propagatedBuildInputs = [ libGLU libX11 ]; + + propagatedBuildInputs = lib.optionals stdenv.isLinux [ libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ OpenGL ]; # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ @@ -33,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_EXAMPLES=OFF" "-DCUSTOMIZE_BUILD=1" ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" - ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; + ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; passthru.tests = [ raylib-games ]; @@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.raylib.com/"; license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; - platforms = platforms.linux; + platforms = platforms.all; changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; }) diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 7cb99f06505..73de0a287cb 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }: +{ stdenv, lib, fetchFromGitHub, cmake, gfortran, gtest, openmp }: stdenv.mkDerivation rec { pname = "spglib"; @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ="; }; - nativeBuildInputs = [ cmake gtest ]; + nativeBuildInputs = [ cmake gfortran gtest ]; buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index d1f93f57264..082f47313bd 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionAtLeast ocaml.version "5.0" then throw "erm_xml is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 2eca9a4644b..5d7e5f59b8b 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }: stdenv.mkDerivation { - pname = "ocaml-fontconfig"; + pname = "ocaml${ocaml.version}-fontconfig"; version = "unstable-2013-11-03"; src = fetchFromGitHub { @@ -11,6 +11,12 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; + postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.03") '' + substituteInPlace extract_consts.ml \ + --replace String.lowercase String.lowercase_ascii \ + --replace String.capitalize String.capitalize_ascii + ''; + nativeBuildInputs = [ pkg-config ocaml ]; buildInputs = [ fontconfig ]; @@ -24,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Fontconfig bindings for OCaml"; license = lib.licenses.gpl2Plus; - platforms = ocaml.meta.platforms or [ ]; + platforms = ocaml.meta.platforms; maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 3c56aaf0a0a..8a960dedcb5 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, ocaml, findlib }: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; - let param = if lib.versionAtLeast ocaml.version "4.02" then { version = "0.6"; @@ -12,6 +10,9 @@ let param = }; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "functory is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation { pname = "ocaml${ocaml.version}-functory"; inherit (param) version; diff --git a/pkgs/development/ocaml-modules/gd4o/default.nix b/pkgs/development/ocaml-modules/gd4o/default.nix index cd206964856..f3206c2385a 100644 --- a/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/pkgs/development/ocaml-modules/gd4o/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, ocaml, gd, freetype, findlib, zlib, libpng, libjpeg }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "gd4o is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-gd4o"; version = "1.0a5"; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 43bd194b655..7c197f9e87b 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -1,6 +1,9 @@ { lib, buildDunePackage, ocaml, ocaml_gettext, dune-configurator, ounit }: -buildDunePackage rec { +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "gettext-stub is not available for OCaml ${ocaml.version}" + +buildDunePackage { pname = "gettext-stub"; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 663c71b926e..f499adc7bb1 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4D7y0TH7tDcbQBhxhFLOjHNaSO3+ATnSq9zkwYekWcM="; + hash = "sha256-GsMcMzoNg8iIMVIyRVAMqoFFA0I3QbDkZTOe9tpbXik="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 44dbdd50fda..6f19a6a7ac1 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.40.0"; + version = "1.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-4LapTxeJtzuXdWRgDmsQ8/yDeYZfMz+kJwpZKF7stmc="; + hash = "sha256-Uxf52UzzCqXFFnQD1DwcSy3ylY+rYq6qbI5XK5JiVto="; }; postPatch = '' diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 36f282fe1e4..0927fba08e5 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.8"; + version = "0.19.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d6I1nRL41sWFvv9Nxw5dSJDEv15i9Lni0wySyWruEGU="; + hash = "sha256-skkkwtmSbGJV6MRBJMfNhu+pWEBuMkB7ozTh9wiyYVM="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 07914459837..4d9c50bb059 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.15.0"; + version = "4.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hVPCQgVu5NkEMJBJcfaER8JGtjnIEWquIcBX6vFSiAc="; + hash = "sha256-o895Xjp/su2mc1WHbsQvWDe28sX/HhLtOb7BC5TFkyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix new file mode 100644 index 00000000000..d8bb73ccdef --- /dev/null +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, setuptools +, pytestCheckHook +, pytest-django +, django-crispy-forms +}: + +buildPythonPackage rec { + pname = "django-crispy-bootstrap4"; + version = "2023.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "django-crispy-forms"; + repo = "crispy-bootstrap4"; + rev = "refs/tags/${version}"; + hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + }; + + propagatedBuildInputs = [ + django + setuptools + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + django-crispy-forms + ]; + + pythonImportsCheck = [ "crispy_bootstrap4" ]; + + meta = with lib; { + description = "Bootstrap 4 template pack for django-crispy-forms"; + homepage = "https://github.com/django-crispy-forms/crispy-bootstrap4"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix index a5201ed5e00..a236a240591 100644 --- a/pkgs/development/python-modules/experiment-utilities/default.nix +++ b/pkgs/development/python-modules/experiment-utilities/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "experiment-utilities"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitLab { owner = "creinke"; repo = "exputils"; domain = "gitlab.inria.fr"; rev = "refs/tags/version_${version}"; - hash = "sha256-y+I/TpEC1alP3145ByM6H//lZl2FrpLT/70lzn04P6w="; + hash = "sha256-jo0CBSpUc/F1lJ2vagocngDM1Lopw5/AJnt1QwCunA8="; }; # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 1caf53c7a2d..134dc8f2e44 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,34 +1,48 @@ { lib -, asgiref -, blinker , buildPythonPackage , fetchPypi +, pythonOlder + +# build-system +, setuptools + +# dependencies , flask +, werkzeug + +# tests +, asgiref +, blinker , pytestCheckHook -, pythonAtLeast -, pythonOlder , semantic-version -, werkzeug }: buildPythonPackage rec { pname = "flask-login"; - version = "0.6.2"; - format = "setuptools"; + version = "0.6.3"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Login"; inherit version; - hash = "sha256-wKe6qf3ESM3T3W8JOd9y7sUXey96vmy4L8k00pyqycM="; + hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask werkzeug ]; + pythonImportsCheck = [ + "flask_login" + ]; + nativeCheckInputs = [ asgiref blinker @@ -36,25 +50,8 @@ buildPythonPackage rec { semantic-version ]; - disabledTests = [ - # https://github.com/maxcountryman/flask-login/issues/747 - "test_remember_me_accepts_duration_as_int" - "test_remember_me_custom_duration_uses_custom_cookie" - "test_remember_me_refresh_every_request" - "test_remember_me_uses_custom_cookie_parameters" - ] ++ lib.optionals (pythonAtLeast "3.10") [ - "test_hashable" - ]; - - pytestFlagsArray = [ - "-W" "ignore::DeprecationWarning" - ]; - - pythonImportsCheck = [ - "flask_login" - ]; - meta = with lib; { + changelog = "https://github.com/maxcountryman/flask-login/blob/${version}/CHANGES.md"; description = "User session management for Flask"; homepage = "https://github.com/maxcountryman/flask-login"; license = licenses.mit; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index 3989cf6f72c..64159dd7b75 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "bfacdcadd7903ed6afce6168e1977e473b431677b358f8fd42e80b48cedd19ab"; + hash = "sha256-hNCQQjqIeVIEZb/peECD7ay4014rpRH6Whve8B2Pce0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hwdata/default.nix b/pkgs/development/python-modules/hwdata/default.nix new file mode 100644 index 00000000000..9e73fb61017 --- /dev/null +++ b/pkgs/development/python-modules/hwdata/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkgs +, setuptools +}: + +buildPythonPackage rec { + pname = "hwdata"; + version = "2.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "xsuchy"; + repo = "python-hwdata"; + rev = "python-hwdata-${version}-1"; + hash = "sha256-hmvxVF9LOkezXnJdbtbEJWhU4uvUJgxQHYeWUoiniF0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + patchPhase = '' + substituteInPlace hwdata.py --replace "/usr/share/hwdata" "${pkgs.hwdata}/share/hwdata" + ''; + + pythonImportsCheck = [ + "hwdata" + ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Python bindings to hwdata"; + homepage = "https://github.com/xsuchy/python-hwdata"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lurkki ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index 6deb3912730..a408137650a 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -1,91 +1,92 @@ { lib , buildPythonPackage , fetchPypi -, hatchling -, jsonschema , pythonOlder -, requests -, pytestCheckHook -, json5 +, hatchling , babel +, importlib-metadata +, jinja2 +, json5 +, jsonschema , jupyter-server -, tomli +, packaging +, requests , openapi-core , pytest-jupyter +, pytestCheckHook , requests-mock , ruamel-yaml , strict-rfc3339 -, importlib-metadata }: buildPythonPackage rec { - pname = "jupyterlab_server"; - version = "2.25.0"; - format = "pyproject"; + pname = "jupyterlab-server"; + version = "2.25.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-d8Lx8oLWEPleSW4g1b8dKncGgm37exjzN4rihw0nL7c="; + pname = "jupyterlab_server"; + inherit version; + hash = "sha256-ZJEoOwAAaY6uGjjEhQeTBWDfz3RhrqABU2hpiqs03Zw="; }; + postPatch = '' + sed -i "/timeout/d" pyproject.toml + ''; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ - requests - jsonschema - json5 babel + jinja2 + json5 + jsonschema jupyter-server - tomli + packaging + requests ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + passthru.optional-dependencies = { + openapi = [ + openapi-core + ruamel-yaml + ]; + }; + nativeCheckInputs = [ - openapi-core - pytestCheckHook pytest-jupyter + pytestCheckHook requests-mock - ruamel-yaml strict-rfc3339 - ]; - - postPatch = '' - sed -i "/timeout/d" pyproject.toml - ''; + ] ++ passthru.optional-dependencies.openapi; preCheck = '' export HOME=$(mktemp -d) ''; - pytestFlagsArray = [ - # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. - # Use setuptools or check PEP 632 for potential alternatives. - "-W ignore::DeprecationWarning" - ]; - disabledTestPaths = [ - "tests/test_settings_api.py" - "tests/test_themes_api.py" + # require optional language pack packages for tests "tests/test_translation_api.py" - "tests/test_workspaces_api.py" ]; - disabledTests = [ - "test_get_listing" + pythonImportsCheck = [ + "jupyterlab_server" + "jupyterlab_server.pytest_plugin" ]; __darwinAllowLocalNetworking = true; meta = with lib; { description = "A set of server components for JupyterLab and JupyterLab like applications"; - homepage = "https://jupyterlab-server.readthedocs.io/"; + homepage = "https://github.com/jupyterlab/jupyterlab_server"; changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md"; - license = licenses.bsdOriginal; + license = licenses.bsd3; maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 763e44fb142..6a6acff7aaf 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -9,7 +9,7 @@ , ipykernel , jupyter-core , jupyter-lsp -, jupyterlab_server +, jupyterlab-server , jupyter-server , notebook-shim , jinja2 @@ -42,7 +42,7 @@ buildPythonPackage rec { ipykernel jupyter-core jupyter-lsp - jupyterlab_server + jupyterlab-server jupyter-server notebook-shim jinja2 diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix deleted file mode 100644 index eae9f78b26a..00000000000 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, chardet -, dnspython -, html5-parser -, lxml -, namedlist -, sqlalchemy -, tornado -, yapsy -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "ludios_wpull"; - version = "3.0.9"; - - # https://github.com/ArchiveTeam/ludios_wpull/issues/20 - disabled = pythonAtLeast "3.9"; - - src = fetchFromGitHub { - rev = version; - owner = "ArchiveTeam"; - repo = "ludios_wpull"; - sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; - }; - - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado yapsy ]; - - # Test suite has tests that fail on all platforms - doCheck = false; - - meta = { - description = "Web crawler; fork of wpull used by grab-site"; - homepage = "https://github.com/ArchiveTeam/ludios_wpull"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ivan ]; - broken = lib.versions.major tornado.version != "4"; - }; -} diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index d25daaf21bc..353e2c0e053 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -24,6 +24,7 @@ # tests , nettools +, unixtools , mock , magic-wormhole-transit-relay , magic-wormhole-mailbox-server @@ -72,7 +73,8 @@ buildPythonPackage rec { magic-wormhole-mailbox-server pytestCheckHook ] - ++ passthru.optional-dependencies.dilation; + ++ passthru.optional-dependencies.dilation + ++ lib.optionals stdenv.isDarwin [ unixtools.locale ]; disabledTests = lib.optionals stdenv.isDarwin [ # These tests doesn't work within Darwin's sandbox diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 68bd4b5c29c..199b4ab8a69 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.2"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-c6NSDFQGKtT8Otw+ivNUZ2+Qm/LEDGpZNs3FrYq+N1A="; + hash = "sha256-7ZSPxKRLAgwC1ECxa1eOTH60cMJXs1iv2PE2Vq9f0co="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 90d063a5114..3b039936561 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -3,24 +3,26 @@ , fetchFromGitHub , niapy , nltk +, numpy , pandas , poetry-core , pytestCheckHook , pythonOlder +, tomli }: buildPythonPackage rec { pname = "niaarm"; - version = "0.3.3"; + version = "0.3.5"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-kWOJfADqtC8YdZUlifKeiaS2a2cgcsMgCf0IHJt4NKY="; + hash = "sha256-E5G1uVDSErqwxTBNQ7qselemW9A3W8sr3ExPEh+1les="; }; nativeBuildInputs = [ @@ -30,7 +32,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ niapy nltk + numpy pandas + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; disabledTests = [ diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 0532d2472a7..88f4c975a85 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -7,7 +7,7 @@ , hatchling , jupyter-server , jupyterlab -, jupyterlab_server +, jupyterlab-server , notebook-shim , tornado , pytest-jupyter @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jupyter-server jupyterlab - jupyterlab_server + jupyterlab-server notebook-shim tornado ]; diff --git a/pkgs/development/python-modules/prayer-times-calculator/default.nix b/pkgs/development/python-modules/prayer-times-calculator/default.nix index 672c4c393da..e60bc33383d 100644 --- a/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.9"; + version = "0.0.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "uchagani"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QIUMxs6NOqnljTi1UNp7bCQ9TgBy/u+BWEqgr2C854g="; + hash = "sha256-T+rXJy+9haepF6TKSoOjb6o75YQwQnzAaWRtLMwfGOw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index 8c49de1e528..9a1af7c13cf 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, nose +, setuptools +, pytestCheckHook , numpy , pythonOlder , six @@ -10,25 +11,33 @@ buildPythonPackage rec { pname = "py-stringmatching"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "py_stringmatching"; inherit version; - sha256 = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4="; + hash = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy six ]; nativeCheckInputs = [ - nose + pytestCheckHook ]; + preCheck = '' + cd $out + ''; + pythonImportsCheck = [ "py_stringmatching" ]; diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index a375ded35f0..c27bb5f2757 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { description = "Settings management using pydantic"; homepage = "https://github.com/pydantic/pydantic-settings"; license = licenses.mit; + broken = lib.versionOlder pydantic.version "2.0.0"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index b6dd8ac8491..ce1e74e3ffc 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.14.2"; + version = "1.14.3"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-8tBxepvNT+EVGKRhLqmAaLYvmf4J2Jquz0R8sSLUCH8="; + hash = "sha256-cjkmRGieSKynL8cZORp11/ViK8oCBAZXrgbFKumWKaM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 847fcd43552..8fe421cd932 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -14,13 +14,14 @@ , responses , restfly , semver +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "pytenable"; version = "1.4.13"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-UY3AFnPplmU0jrV4LIKH4+2tcJEFkKMqO2GWVkgaHYE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ defusedxml marshmallow @@ -50,12 +55,20 @@ buildPythonPackage rec { responses ]; + disabledTestPaths = [ + # Disable tests that requires network access + "tests/io/" + ]; + disabledTests = [ # Disable tests that requires a Docker container "test_uploads_docker_push_name_typeerror" "test_uploads_docker_push_tag_typeerror" "test_uploads_docker_push_cs_name_typeerror" "test_uploads_docker_push_cs_tag_typeerror" + # Test requires network access + "test_assets_list_vcr" + "test_events_list_vcr" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix index 335f2de30a8..f3b556699e8 100644 --- a/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/pkgs/development/python-modules/pytest-json-report/default.nix @@ -6,22 +6,27 @@ , pytest-xdist , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytest-json-report"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "numirias"; - repo = pname; - rev = "v${version}"; + repo = "pytest-json-report"; + rev = "refs/tags/v${version}"; hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; @@ -38,6 +43,7 @@ buildPythonPackage rec { disabledTests = [ # pytest-flaky is not available at the moment "test_bug_31" + "test_environment_via_metadata_plugin" ]; pythonImportsCheck = [ @@ -47,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to report test results as JSON"; homepage = "https://github.com/numirias/pytest-json-report"; + changelog = "https://github.com/numirias/pytest-json-report/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 1019b058e11..4670d58420b 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-frontmatter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "eyeseast"; repo = pname; - rev = "v${version}"; - sha256 = "0flyh2pb0z4lq66dmmsgyakvg11yhkp4dk7qnzanl34z7ikp97bx"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lkBCKZ1fZF580+4TnHYkfaGJjsWk7/Ksnk7VagZuef8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-twitch-client/default.nix b/pkgs/development/python-modules/python-twitch-client/default.nix index b069de34c3f..29a10ced06f 100644 --- a/pkgs/development/python-modules/python-twitch-client/default.nix +++ b/pkgs/development/python-modules/python-twitch-client/default.nix @@ -5,32 +5,50 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "python-twitch-client"; version = "0.7.1"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tsifrer"; - repo = pname; - rev = version; - sha256 = "10wwkam3dw0nqr3v9xzigx1zjlrnrhzr7jvihddvzi84vjb6j443"; + repo = "python-twitch-client"; + rev = "refs/tags/${version}"; + sha256 = "sha256-gxBpltwExb9bg3HLkz/MNlP5Q3/x97RHxhbwNqqanIM="; }; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; nativeCheckInputs = [ pytestCheckHook responses ]; - pythonImportsCheck = [ "twitch" ]; + pythonImportsCheck = [ + "twitch" + ]; + + disabledTests = [ + # Tests require network access + "test_delete_from_community" + "test_update" + ]; meta = with lib; { description = "Python wrapper for the Twitch API"; homepage = "https://github.com/tsifrer/python-twitch-client"; + changelog = "https://github.com/tsifrer/python-twitch-client/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index ac67ff88acb..34a5c17a477 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.18.1"; + version = "0.18.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-0ArnP9xITVpbIfDrsNK3ukmeJBdd6SE3tnDwCLWSHMo="; + hash = "sha256-fgnR3TZh+cHvC8qJnvwfrrtxCdEr89Uw8ciACzaQPYE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sgp4/default.nix b/pkgs/development/python-modules/sgp4/default.nix index 242a1c882c9..9f6693603e0 100644 --- a/pkgs/development/python-modules/sgp4/default.nix +++ b/pkgs/development/python-modules/sgp4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sgp4"; - version = "2.22"; + version = "2.23"; src = fetchPypi { inherit pname version; - hash = "sha256-F/Ci6q0tygZbbeJcHOqpQP98+ozGcSDLQRGgDxd7hvk="; + hash = "sha256-2K3cU6L7n4je5r/UAdKGWwFMwLV78s7mm97o2WhdVCk="; }; nativeCheckInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index cfdfd6de623..aabc1c49d0c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.26"; + version = "0.27"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rbM5fVywYTYyzT2teJQ4FCK6wkRkw5PLBQQE3WcSsac="; + hash = "sha256-iXV3ju2cFCpC7NxOzYMTLewGkMA1yueIwSN1Dq1SZwM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 8a09309d53a..936d904c652 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.10"; + version = "1.7.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7b9NZQeKb6dDllAgGOEdIYNUYKgF74VlMt2NKCIV+KQ="; + hash = "sha256-gjObtmEvvyCnqd+bLdirzW18/AarmvhF6ItvqJ2Qmuo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 18f8623f453..ccf17cdb117 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.2.0"; + version = "8.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gsoeeDHjVNdMZ3bth9vXP0qtWe0ljIdGy+hoaIGG/Ek="; + hash = "sha256-zX/bPYg6FeaQYlTn+wFi9ph46czdH4UZ22/7/ka/b0k="; }; postPatch = '' @@ -97,6 +97,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for NLP machine learning"; homepage = "https://github.com/explosion/thinc"; + changelog = "https://github.com/explosion/thinc/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aborsu ]; }; diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index 90f5b783cc8..7d285b06288 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.15"; + version = "0.9.16"; format = "setuptools"; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; rev = "refs/tags/v${version}"; - hash = "sha256-xNRfsIfhoVI5ORWn6NmLCuMMJregIZWQ20QBiBsA1Pc="; + hash = "sha256-9ksHA8uvBv370/6Umt5iz/4F8VsDDI9X8kVc5Lv0RVk="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for Cisco UCS"; homepage = "https://github.com/CiscoUcs/ucsmsdk"; + changelog = "https://github.com/CiscoUcs/ucsmsdk/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index 5e09df1f6d1..972aa3093a8 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -1,22 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "unicodedata2"; - version = "15.0.0"; + version = "15.1.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; + hash = "sha256-yzDxia1mSC+FKaRdpxsqiEHpvSuzdswpMwA6SlWgdkg="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "unicodedata2" + ]; meta = with lib; { description = "Backport and updates for the unicodedata module"; homepage = "https://github.com/mikekap/unicodedata2"; + changelog = "https://github.com/fonttools/unicodedata2/releases/tag/${version}"; license = licenses.asl20; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index ee2557aeffa..549c0b6dd0f 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.7.5"; + version = "0.7.11"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-PorNIga1NgKgxkTfa5uBbVJbYoETuDrskDr2jSGwyYE="; + hash = "sha256-cUd1umD61xHPehutBh5pUWTLyOdn3vbgerRQmsOpuDM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index acadf65a752..582d0040e10 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.10.24"; + version = "0.10.30"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-C1rjZRNXFr3syPnq7uhKRYz9Xydmunc/0uQcLxfN6tU="; + hash = "sha256-RaVg4XNmh1S5G1CHQiME7t/BmK0MI9M8wI2YTKjpqzM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 62392ada77a..c99e89944c4 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.47.0"; + version = "0.48.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-pJtqKA04zooFDfxWGbTFZewS8N0Z2eB9iLFLYueu8oo="; + hash = "sha256-8JJBWF53VOmTD/uetCURFaTkfSTax/YeafKsZtA1xAA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 14a1a78b2bf..e3bb7c34b5b 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.59.1"; + version = "0.59.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-h2rMfpLsc2IPZN0Qp7vomoFMJxLXctkuiov3sntd5c0="; + hash = "sha256-Z9tiK6oDyyMcXhgUUxSDL9URYDp6Uz8rFPART3qxd+s="; }; propagatedBuildInputs = [ @@ -47,14 +47,12 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace requirements.txt \ - --replace "requests~=2.29.0" "requests" substituteInPlace image_extra_requirements.txt \ --replace "pillow~=" "pillow>=" \ --replace "ascii_magic~=" "ascii_magic>=" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ - --replace "pytest-cov" "" + --replace "required_plugins = pytest-httpserver pytest-cov" "" ''; pythonImportsCheck = [ diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 4924e190251..e717c852112 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-QU3nSq13klBoa3+czvdlrNwtG0iQqoC/hcbTHr5KN14="; + hash = "sha256-udP11icQp90u8hmDkg9nKQYPvHFDLeylQS6sLS74ErY="; }; - vendorHash = "sha256-yWxBiOPB0z3+bd6f+LalfVYYoV04scnl3YXJkaTo/dk="; + vendorHash = "sha256-sSWDy8LsqRP4DNuWI8HhE6ojjnHx2Ltyw55oaGOa1ms="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 1cacff7b32f..cdb54fa07f7 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub }: let - version = "1.0.3"; - srcHash = "sha256-P1ODGxHkrh8o+RMxxu7OCuHkShfLyQcF9KVNYw45T5A="; - vendorHash = "sha256-j2C66oTv0RY8VGDEivrj/p2PtGAhrDhi9oBvNXATurI="; + version = "1.0.5"; + srcHash = "sha256-tkgkhYuLHfmT42P+UMZ7uNB2wBKo0YGiw0a5RoMAu6M="; + vendorHash = "sha256-QTTnTPOgP+FlbqXNCGJc9VuBzQcMujpvFB3+DykYTPY="; yarnHash = "sha256-TrcTc5svLLSedRC8gCwIBW7/mtHo+uSNZGImtRiVJ0w="; in { diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 42f8eecbb27..0c7ff5382f4 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.48"; + version = "0.0.49"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-do/p4sQ/OoswiC/19gKk5xeWbZ8iEOX5oPg5cY7ofYA="; + sha256 = "sha256-sHdULnaLHe4FqP631c4ITNDn62nGJgAIIvO3C4kY3jI="; }; - vendorHash = "sha256-+QYJijb5l++fX7W4xVtAZyQwjEsGEuStFAUHPB4cVHE="; + vendorHash = "sha256-ZChHQ0Bcu9sVHvhdrmTfLryRwsFQNQSFDOKRu0keUIo="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix index e7e01bf8b5a..1a59a96b08b 100644 --- a/pkgs/development/tools/eslint_d/default.nix +++ b/pkgs/development/tools/eslint_d/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "eslint_d"; - version = "12.2.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "mantoni"; repo = "eslint_d.js"; rev = "v${version}"; - hash = "sha256-rups2y07Y3GkvGt/T9lPG0NUoCxddp/P9PAYczZYNIw="; + hash = "sha256-tlpuJ/p+U7DuzEmy5ulY3advKN+1ID9LDjUl8fDANVs="; }; - npmDepsHash = "sha256-enHppjkX1syANgFmfAX+LlISyN5ltADjojjrvukAI+I="; + npmDepsHash = "sha256-MiuCupnzMUjwWh47SLnMRmtHBMbXdyjEZwgvaZz4JN0="; dontNpmBuild = true; diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix index 821453314a8..f8fd1bb2830 100644 --- a/pkgs/development/tools/nc4nix/default.nix +++ b/pkgs/development/tools/nc4nix/default.nix @@ -8,13 +8,13 @@ buildGoModule { pname = "nc4nix"; - version = "unstable-2023-06-06"; + version = "unstable-2023-11-06"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "nc4nix"; - rev = "3e015450726533770fd00e2771530cbe90f40517"; - sha256 = "sha256-i3lx5Q+EswtimdRMZ0OPMWh01kBK9q+UI1pY6j/ZhuY="; + rev = "47666b418a71c609f8d2b2c2679956c2ac9818e5"; + hash = "sha256-cXg0emFFAYI1Jtiz+Xilmct3JNiO9cSWUbghyIRQBnY="; }; patches = [ @@ -25,15 +25,6 @@ buildGoModule { sha256 = "sha256-0JxyhSQLtlgLtsMv82wMjQHGdmOoQ2dcPPNAw2cFByE="; name = "switch_hash_calculation_method.patch"; }) - - # Fix invalid entries (pre-releases of apps are not to be taken into account, - # but if only pre-releases are compatible with a given Nextcloud version, - # invalid entries are generated) - (fetchpatch { - url = "https://github.com/helsinki-systems/nc4nix/commit/c48131b5ca382585fd3294d51d59acc1e92fadb1.patch"; - sha256 = "sha256-/zc3Smjd6CksC5wUvoB6uAyTzPcIgqimb+zASIuTft0="; - excludes = [ "25.json" "26.json" "27.json" ]; - }) ]; vendorHash = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index 0f4300fc67c..03d3d440c29 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; + postInstall = '' + install -Dm444 ../udev/99-picotool.rules -t $out/etc/udev/rules.d + ''; + meta = with lib; { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index b5f73a13c35..d8d52809083 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.31"; + version = "2.3.32"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-liDm8lcHSdn9f/tNISRlnqEIcBtmusMplH0N4tW5Lgo="; + hash = "sha256-miJ/WONNDieLryD2J9JmkmSCG5Iesg2N2GT/FI9NGY0="; }; postPatch = '' diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 383db37e199..74a3d6b149b 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2023-10-16"; + version = "unstable-2023-11-09"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "f8ffbf2362384e2311a8df458fcf39f44fc491bc"; - sha256 = "sha256-bGxh5bT7sDiIbSKghqlcx1ILPAiffL6lsbWSp5G1CSo="; + rev = "66460cb9628864e230f6b30adc49c4b848d2e843"; + sha256 = "sha256-pB68YxLHiNFhW+0PZ+UW39V59aE11CXZH7WXyqgyRIk="; }; - cargoSha256 = "sha256-czzH0DgtK0sZmc670423hcdNQIc30tm+qtY+GA8WZbo="; + cargoSha256 = "sha256-iw+7xsVNpIQIxDAmN878v88k1EYe1FnJPVpGBhyVstA="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index a635e8dbd8c..74b5a5dd3a4 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-OgC8s9xFKsm2Q2V3Y0jodp521IQixJxeCn27zT8Uv4U="; + hash = "sha256-OVtSvlmMRngxhUeq4u+exVc7WQUqBnksDpb8esbly9Y="; }; - cargoHash = "sha256-2Uh2H4HdmlHNLCsTQzbsgDkPnKRpMkopfTyLHIsUbKY="; + cargoHash = "sha256-3OuyN+nm2t+LH8lue3xYoBQp7OYjzhDbnc2LCGqFJgY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index a6ddc95e532..4fb099b3c0b 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.18.4"; + version = "0.18.5"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-u4LEE3fDYneKhNU38VeVNvqcbDO0pws6yldgcvwSv6M="; + sha256 = "sha256-be0jgjhaboutT+c3rRyp6fjmv8nAkggkcqofWmH83Zc="; }; - cargoSha256 = "sha256-pgffaqHWnm3RBE9TGbpRJX35BFpXW/na9wmad9eyCXw="; + cargoHash = "sha256-Sset3+jRm6yOUkvLYxBHdFvVCYOq3bvix9b3pnt7AV8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix index 7532be8d195..77e58ed5a1a 100644 --- a/pkgs/games/brogue-ce/default.nix +++ b/pkgs/games/brogue-ce/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "A community-lead fork of the minimalist roguelike game Brogue"; homepage = "https://github.com/tmewett/BrogueCE"; license = licenses.agpl3; - maintainers = with maintainers; [ fgaz ]; + maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = platforms.all; }; } diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index d7f5694bfb6..0cd3e779c56 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; - maintainers = [ ]; + maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/games/raylib-games/default.nix index 6cb2b540f4a..34ef5c80143 100644 --- a/pkgs/games/raylib-games/default.nix +++ b/pkgs/games/raylib-games/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, raylib }: +{ lib, stdenv, fetchFromGitHub, raylib, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ]; + buildInputs = [ raylib ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 25287c89113..2fcbec7a1d3 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -315,6 +315,7 @@ in buildFHSEnv rec { meta = (steam.meta or {}) // { description = "Run commands in the same FHS environment that is used for Steam"; + mainProgram = "steam-run"; name = "steam-run"; }; }; diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index b88c3ac9477..0a621f625e8 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -71,7 +71,7 @@ in meta = with lib; { description = "Custom launcher for FFXIV"; - homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; + homepage = "https://github.com/goatcorp/XIVLauncher.Core"; license = licenses.gpl3; maintainers = with maintainers; [ sersorrel witchof0x20 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index b43e6400c8d..78479199b14 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -16,12 +16,12 @@ }: let - version = "2.1.1"; + version = "2.2"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-lVjbbFZ0Oh3AOzj1mAH7QOkcyJH4/AyJ5bCwZ3YfFI4="; + hash = "sha256-yFxKqEMF77aRFc1JehIOvdECWJk7TPEjqCRbPZnUmHQ="; }; in stdenv.mkDerivation rec { @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Genymobile"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SRIQqmvqB1kudUvt0HTFPMdk7MLWEcK2jOT0on1rh+E="; + repo = "scrcpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-2/IsDZJAtERs2AG6J4LR/ffy4XYmaj0KeSwZLQ849Lc="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Display and control Android devices over USB or TCP/IP"; homepage = "https://github.com/Genymobile/scrcpy"; + changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}"; sourceProvenance = with sourceTypes; [ fromSource binaryBytecode # server diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix index 10f7f2e64d0..b52e1520096 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix @@ -5,7 +5,9 @@ , fltk13 , gtk2 , gtk3 +, makeWrapper , pkg-config +, psmisc }: stdenv.mkDerivation (finalAttrs: { @@ -18,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ + makeWrapper pkg-config ]; @@ -26,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { fltk13 gtk2 gtk3 + psmisc ]; env.TOOLSET = lib.concatStringsSep " " [ @@ -91,6 +95,15 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + fixupPhase = '' + runHook preFixup + + wrapProgram $out/bin/hdajackretask \ + --prefix PATH : ${lib.makeBinPath [ psmisc ]} + + runHook postFixup + ''; + meta = { homepage = "http://www.alsa-project.org/"; description = "ALSA Tools"; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 2775b180188..73b098894b9 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2023-07-23"; + version = "${kernel.version}-unstable-2023-09-24"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "83db18e610845df9434a628ca3feb9004296b307"; - sha256 = "sha256-as3S7WQkug3suJ5ovUbRu/UzO5GDrGLdgkiWrCrvztk="; + rev = "888ba1b309e6258a736ef5c37a68836cd0ea5517"; + sha256 = "sha256-oLRGRKUNTmIw+Zn23TArGumo24AIH2YEMpnStyXBNw8="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index dfc43cba01c..9ce8c102c25 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,7 +1,18 @@ -{ appimageTools, lib, fetchurl }: +{ lib +, stdenvNoCC +, fetchurl +, appimageTools +, electron +, makeWrapper +, asar +, autoPatchelfHook +, libusb1 +}: + let pname = "uhk-agent"; version = "3.1.0"; + src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; @@ -12,22 +23,45 @@ let name = "${pname}-${version}"; inherit src; }; -in appimageTools.wrapType2 { +in +stdenvNoCC.mkDerivation { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ polkit udev ]; + dontUnpack = true; + + nativeBuildInputs = [ + asar + makeWrapper + autoPatchelfHook + ]; + + buildInputs = [ + libusb1 + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out"/{opt,share/applications} + + cp -r --no-preserve=mode "${appimageContents}/resources" "$out/opt/${pname}" + cp -r --no-preserve=mode "${appimageContents}/usr/share/icons" "$out/share/icons" + cp -r --no-preserve=mode "${appimageContents}/${pname}.desktop" "$out/share/applications/${pname}.desktop" + + substituteInPlace "$out/share/applications/${pname}.desktop" \ + --replace "Exec=AppRun" "Exec=${pname}" + + asar extract "$out/opt/${pname}/app.asar" "$out/opt/${pname}/app.asar.unpacked" + rm "$out/opt/${pname}/app.asar" - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} + makeWrapper "${electron}/bin/electron" "$out/bin/${pname}" \ + --add-flags "$out/opt/${pname}/app.asar.unpacked" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - install -m 644 -D ${appimageContents}/resources/rules/50-uhk60.rules $out/rules/50-uhk60.rules - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + runHook postInstall ''; - # wrapType2 does not passthru pname+version - passthru.version = version; meta = with lib; { description = "Agent is the configuration application of the Ultimate Hacking Keyboard"; diff --git a/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/pkgs/os-specific/linux/uhk-udev-rules/default.nix index bcb7799731f..1b68c46b657 100644 --- a/pkgs/os-specific/linux/uhk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/uhk-udev-rules/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' runHook preInstall - install -D -m 644 ${uhk-agent.out}/rules/50-uhk60.rules $out/lib/udev/rules.d/50-uhk60.rules + install -D -m 644 ${uhk-agent.out}/opt/uhk-agent/rules/50-uhk60.rules $out/lib/udev/rules.d/50-uhk60.rules runHook postInstall ''; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index e41ec383a9b..e0a66d136db 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-1EdDMSlC6hh1iNmra63DTLG6TAkmpZ/lIjvdfLJuC74="; - arm64-linux_hash = "sha256-CZj/zg6SkHmpiIbEIpxYMtlSLsDTFLBJYqr2pUpSu94="; - x64-osx_hash = "sha256-NRMbHLffx093gEb24I/fdp2fYioDehQ5gBMpZciX+ts="; + x64-linux_hash = "sha256-XWKslumO6o0kn9JMFTTuDTDALX6r4rzEyFFj2w13cYc="; + arm64-linux_hash = "sha256-rsgyTgSW1w/zrXbOvwbJ8KTRK6HheKpACoR3Tjw5z+k="; + x64-osx_hash = "sha256-tJkYWvJfxF2zMl1TEG5qhoV2qKya0bzIitNVIaeRLSI="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.8.2267"; + version = "0.3.10.2287"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/servers/roadrunner/default.nix index b6885bc9ee9..25f34346285 100644 --- a/pkgs/servers/roadrunner/default.nix +++ b/pkgs/servers/roadrunner/default.nix @@ -6,12 +6,12 @@ buildGoModule rec { pname = "roadrunner"; - version = "2023.2.2"; + version = "2023.3.4"; src = fetchFromGitHub { repo = "roadrunner"; owner = "roadrunner-server"; rev = "v${version}"; - hash = "sha256-tkJ7MDFHWps6bCppFJXMFYQl7+i8OhuDVrk1n78rrUc"; + hash = "sha256-khG0T88TR7hg9OO7E9eCGTB3q3c5r94nANSZ1J6vCj0="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildGoModule rec { --replace "127.0.0.1:0" "127.0.0.1:55554" ''; - vendorHash = "sha256-pRZaJ1PBtshhna71V86IJ0VKs0u9wCFG27mghcE/8xY"; + vendorHash = "sha256-UP+a47EALxFTxMl9yxinF4QiifQXAgAZ6ZOt9ebhlDc="; meta = { changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix index a40d58afb8d..7fb028de5fc 100644 --- a/pkgs/servers/unstructured-api/default.nix +++ b/pkgs/servers/unstructured-api/default.nix @@ -21,7 +21,7 @@ let safetensors uvicorn ] ++ packages.unstructured.optional-dependencies.local-inference); - version = "0.0.53"; + version = "0.0.57"; unstructured_api_nltk_data = symlinkJoin { name = "unstructured_api_nltk_data"; @@ -35,7 +35,7 @@ in stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-lD3f6ws3xGFZsC1wHoWydIkWOgIwXuZencle+jJ8T3Y="; + hash = "sha256-FdRrGqF1cJImFVNs/tZo1457f9yhhpwxGGmpAdZUWso="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b6a73381e19..3050cbbaac7 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.92.0"; + version = "3.93.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-linux-x64.tar.gz"; - sha256 = "1242rammgc5wghyasz9ir9x0jff2yrn8c0cjnmdrg3nz7hihl5mb"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-linux-x64.tar.gz"; + sha256 = "1s081ak1m55jckgrrcnj918smlx79sywqgqfbvf50hkcrk5pwdsj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-darwin-x64.tar.gz"; - sha256 = "199qq9j471dw3114kv9dwkpb0bnf3cw6c3khs1kldv8rrh6f3bnv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-darwin-x64.tar.gz"; + sha256 = "0gxch1ml2sv66wbzfycsg02f6cagwrv0kl2b437xnn8g86mxi2di"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-linux-arm64.tar.gz"; - sha256 = "1d1ynrc13a844fd58dkrva59fqjn2x9inhc4a7887arq1j0qww5p"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-linux-arm64.tar.gz"; + sha256 = "0xmsn6qyrmiqpgpffr1c0ykpw06ca8lcv4hgsvv12jxzqrasdv6a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.92.0-darwin-arm64.tar.gz"; - sha256 = "0294zhmxsr3fzd5qz2hlhmcdiyqmncgc8grmhjrlrld1x13rgcxb"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.93.0-darwin-arm64.tar.gz"; + sha256 = "0q59khgglzk0dkz1p81nmj0v7gsgkdfv2109sk3lb7ms5myknkd6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix deleted file mode 100644 index ee30ab3037a..00000000000 --- a/pkgs/tools/backup/grab-site/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, python38, fetchPypi, fetchFromGitHub }: -let - python = python38.override { - self = python; - packageOverrides = self: super: { - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "1.3.24"; - src = fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; - }; - doCheck = false; - }); - tornado = super.tornado_4; - }; - }; - -in -with python.pkgs; buildPythonApplication rec { - pname = "grab-site"; - version = "2.2.7"; - - src = fetchFromGitHub { - rev = version; - owner = "ArchiveTeam"; - repo = "grab-site"; - sha256 = "sha256-tf8GyFjya3+TVc2VjlY6ztfjCJgof6tg4an18pz+Ig8="; - }; - - postPatch = '' - substituteInPlace setup.py \ - --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"' - ''; - - propagatedBuildInputs = [ - click - ludios_wpull - manhole - lmdb - autobahn - fb-re2 - websockets - faust-cchardet - ]; - - checkPhase = '' - export PATH=$PATH:$out/bin - bash ./tests/offline-tests - ''; - - meta = with lib; { - description = "Crawler for web archiving with WARC output"; - homepage = "https://github.com/ArchiveTeam/grab-site"; - license = licenses.mit; - maintainers = with maintainers; [ ivan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index be7992f94af..c27e1ff1aac 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -25,16 +25,16 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-5voAO3vHygSo7rl9ELdb9BwMNFVZdjEe7x8foyi+a6s="; + hash = "sha256-YIMtLQzxORWFWCgdnLUQLmmE79aw40LhcxqiHCWjgNk="; }; - vendorHash = "sha256-cv8KUXPRXufvbaZlvf/DeFfQCzu7MAlikRVPHWlakx0="; + vendorHash = "sha256-EutNjyW5bvGvMZP9xBrcu91TOAbl9TDZe2+g0/qnuAQ="; CGO_ENABLED = 0; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 76b8b8f8f52..d838181a9c7 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-bYrn1Ok1yyhiKPUBdvUvTKVeAwsWAwbNoK3IburOAuU="; + hash = "sha256-Wj7zKszVtaTwcIoTtjHasShEnSDoiZ53Gnz38Ci31Hs="; }; vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 22b5035da51..0265e5dd897 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ylwghst ]; + mainProgram = "notify-desktop"; }; } diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 0f93551965e..f6b372d9264 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -114,5 +114,7 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = platforms.unix; + # "Couldn't find any versions for \"node-gyp\" that matches \"latest\" in our cache (possible versions are \"\") + broken = true; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 04503b29e31..5f7b29ded04 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -12,7 +12,7 @@ let inherit (python3Packages) - python pytest nose cryptography pyyaml requests mock requests-mock + python pytest nose3 cryptography pyyaml requests mock requests-mock python-dateutil setuptools; version = "4.28.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pythonPaths = [ cryptography pyyaml requests ]; buildInputs = [ python perl python-dateutil setuptools ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip makeWrapper ]; - nativeCheckInputs = [ nose pytest mock requests-mock ]; + nativeCheckInputs = [ nose3 pytest mock requests-mock ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index e88ba3fea35..a8ccd27a89d 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/timidity/; cp ${./timidity.cfg} $out/share/timidity/timidity.cfg + substituteAllInPlace $out/share/timidity/timidity.cfg tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; # This fixup step is unnecessary and fails on Darwin diff --git a/pkgs/tools/misc/timidity/timidity.cfg b/pkgs/tools/misc/timidity/timidity.cfg index fa07eb43eee..f4a260d249e 100644 --- a/pkgs/tools/misc/timidity/timidity.cfg +++ b/pkgs/tools/misc/timidity/timidity.cfg @@ -41,8 +41,7 @@ # point to the library directory: # -dir /run/current-system/sw/share/timidity/instruments -dir /run/current-system/sw/share/timidity/patch +dir @out@/share/timidity ############################################################################## # This sets up the default patches in the TiMidity support package diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix index 0fbcbcf7a0d..2b419e5403c 100644 --- a/pkgs/tools/misc/vimv-rs/default.nix +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "vimv-rs"; - version = "3.0.0"; + version = "3.1.0"; src = fetchCrate { inherit version; crateName = "vimv"; - hash = "sha256-DpdozP/xaMoRAl8YMj5BmhNedGFhVzscM/eFOcVt+Lk="; + hash = "sha256-jbRsgEsRYF5hlvo0jEB4jhy5jzCAXNzOsNWWyh4XULQ="; }; - cargoHash = "sha256-zKJ8A36/ibAiznm3bK2JSHVRItIAqQ4YFDxvjcZLn3g="; + cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch b/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch new file mode 100644 index 00000000000..4ddd18bbd46 --- /dev/null +++ b/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch @@ -0,0 +1,45 @@ +--- + setup.py | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/setup.py b/setup.py +index 985d28d..933f3df 100755 +--- a/setup.py ++++ b/setup.py +@@ -24,13 +24,9 @@ import shutil + # finding os platform + os_type = platform.system() + +-if os_type == 'Linux' or os_type == 'FreeBSD' or os_type == 'OpenBSD': +- from setuptools import setup, Command, find_packages +- setuptools_available = True +- print(os_type + " detected!") +-else: +- print('This script is only work for GNU/Linux or BSD!') +- sys.exit(1) ++from setuptools import setup, Command, find_packages ++setuptools_available = True ++print(os_type + " detected!") + + # Checking dependencies! + not_installed = '' +@@ -100,6 +96,7 @@ else: + print('paplay is found!') + + # sound-theme-freedesktop ++notifications_path = '' + if os_type == 'Linux': + notifications_path = '/usr/share/sounds/freedesktop/stereo/' + elif os_type == 'FreeBSD' or os_type == 'OpenBSD': +@@ -139,7 +136,7 @@ if sys.argv[1] == "test": + + DESCRIPTION = 'Persepolis Download Manager' + +-if os_type == 'Linux': ++if os_type in ['Linux', 'Darwin']: + DATA_FILES = [ + ('/usr/share/man/man1/', ['man/persepolis.1.gz']), + ('/usr/share/applications/', ['xdg/com.github.persepolisdm.persepolis.desktop']), +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch b/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch new file mode 100644 index 00000000000..50252c8cd72 --- /dev/null +++ b/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch @@ -0,0 +1,41 @@ +--- + persepolis/scripts/mac_notification.py | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) + +diff --git a/persepolis/scripts/mac_notification.py b/persepolis/scripts/mac_notification.py +index 4d69929..9a9a7cf 100644 +--- a/persepolis/scripts/mac_notification.py ++++ b/persepolis/scripts/mac_notification.py +@@ -15,20 +15,13 @@ + + # native notification on mac! needs Xcode (latest version) installed and pyobjc + # library from pip +-import Foundation +-import AppKit +-import objc +- +-NSUserNotification = objc.lookUpClass('NSUserNotification') +-NSUserNotificationCenter = objc.lookUpClass('NSUserNotificationCenter') +- +- + def notifyMac(title, subtitle, info_text, delay=0): +- notification = NSUserNotification.alloc().init() +- notification.setTitle_(title) +- notification.setSubtitle_(subtitle) +- notification.setInformativeText_(info_text) +- notification.setDeliveryDate_(Foundation.NSDate.dateWithTimeInterval_sinceDate_( +- delay, Foundation.NSDate.date())) +- NSUserNotificationCenter.defaultUserNotificationCenter( +- ).scheduleNotification_(notification) ++ print(f""" ++Warning: Persepolis was installed from nixpkgs, which currently breaks notifications ++ on macOS. Until https://github.com/NixOS/nixpkgs/issues/105156 is resolved, ++ this cannot be fixed. The notification that should've been displayed was: ++ ++ title: {title} ++ subtitle: {subtitle} ++ info_text: {info_text} ++ """) +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch b/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch new file mode 100644 index 00000000000..ab3c957ef4b --- /dev/null +++ b/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch @@ -0,0 +1,29 @@ +--- + persepolis/scripts/download.py | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/persepolis/scripts/download.py b/persepolis/scripts/download.py +index aaabb35..69676d3 100644 +--- a/persepolis/scripts/download.py ++++ b/persepolis/scripts/download.py +@@ -72,16 +72,8 @@ def startAria(): + + # in macintosh + elif os_type == 'Darwin': +- if aria2_path == "" or aria2_path == None or os.path.isfile(str(aria2_path)) == False: +- +- cwd = sys.argv[0] +- current_directory = os.path.dirname(cwd) +- aria2d = os.path.join(current_directory, 'aria2c') + +- else: +- aria2d = aria2_path +- +- subprocess.Popen([aria2d, '--no-conf', ++ subprocess.Popen(['aria2c', '--no-conf', + '--enable-rpc', '--rpc-listen-port=' + str(port), + '--rpc-max-request-size=2M', + '--rpc-listen-all', '--quiet=true'], +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch b/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch new file mode 100644 index 00000000000..800f7bddd40 --- /dev/null +++ b/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch @@ -0,0 +1,34 @@ +--- + persepolis/scripts/mainwindow.py | 2 +- + persepolis/scripts/useful_tools.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py +index d21f3f4..a0e3674 100644 +--- a/persepolis/scripts/mainwindow.py ++++ b/persepolis/scripts/mainwindow.py +@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread): + + else: + pipe = subprocess.Popen( +- [ffmpeg_path, '-version'], ++ ['ffmpeg', '-version'], + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, +diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py +index b780967..31733eb 100644 +--- a/persepolis/scripts/useful_tools.py ++++ b/persepolis/scripts/useful_tools.py +@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary): + current_directory = os.path.dirname(cwd) + ffmpeg_path = os.path.join(current_directory, 'ffmpeg') + +- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path, ++ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path, + '-i', audio_file_path, + '-c', 'copy', + '-shortest', +-- +2.39.3 (Apple Git-145) + diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index a4ba2b4f04a..35727c13e69 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, buildPythonApplication, fetchFromGitHub +{ lib +, stdenv +, buildPythonApplication +, fetchFromGitHub , aria +, ffmpeg , libnotify , pulseaudio , psutil @@ -9,7 +13,7 @@ , setuptools , sound-theme-freedesktop , wrapQtAppsHook -, youtube-dl +, yt-dlp }: buildPythonApplication rec { @@ -26,10 +30,27 @@ buildPythonApplication rec { # see: https://github.com/persepolisdm/persepolis/blob/3.2.0/setup.py#L130 doCheck = false; - preBuild='' + preBuild= + # Make setup automatic + '' substituteInPlace setup.py --replace "answer = input(" "answer = 'y'#" + '' + + # Replace abandoned youtube-dl with maintained fork yt-dlp. Fixes https://github.com/persepolisdm/persepolis/issues/930, + # can be removed if that issue is fixed and/or https://github.com/persepolisdm/persepolis/pull/936 is merged + '' + substituteInPlace setup.py ./persepolis/scripts/video_finder_addlink.py --replace \ + "import youtube_dl" "import yt_dlp as youtube_dl" ''; + patches = lib.optionals stdenv.isDarwin [ + # Upstream is abandonware, the last commit to master was on 2021-08-26. + # If it is forked or picked up again, consider upstreaming these patches. + ./0001-Allow-building-on-darwin.patch + ./0002-Fix-startup-crash-on-darwin.patch + ./0003-Search-PATH-for-aria2c-on-darwin.patch + ./0004-Search-PATH-for-ffmpeg-on-darwin.patch + ]; + postPatch = '' sed -i 's|/usr/share/sounds/freedesktop/stereo/|${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/|' setup.py sed -i "s|'persepolis = persepolis.__main__'|'persepolis = persepolis.scripts.persepolis:main'|" setup.py @@ -46,7 +67,7 @@ buildPythonApplication rec { # feed args to wrapPythonApp makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" + "--prefix PATH : ${lib.makeBinPath [ aria ffmpeg libnotify ]}" "\${qtWrapperArgs[@]}" ]; @@ -58,14 +79,13 @@ buildPythonApplication rec { setproctitle setuptools sound-theme-freedesktop - youtube-dl + yt-dlp ]; meta = with lib; { description = "Persepolis Download Manager is a GUI for aria2"; homepage = "https://persepolisdm.github.io/"; - broken = stdenv.isDarwin; # Upstream’s build scripts check and fail on Darwin. license = licenses.gpl3; - maintainers = [ ]; + maintainers = with maintainers; [ iFreilicht ]; }; } diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix index 9903f46fc48..95cfa9a447d 100644 --- a/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.17.1"; + version = "2.18.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-UIwdw9Lw36GFgm7TFjOBdPHFKhbTSfLLT+4XxB39rh8="; + hash = "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc="; }; buildInputs = [ boost diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 0b80cd531d4..2bf354fbc69 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -7,6 +7,7 @@ , fetchurl , fetchpatch , fetchpatch2 +, runCommand , Security , storeDir ? "/nix/store" @@ -112,6 +113,37 @@ let hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; }; + # Intentionally does not support overrideAttrs etc + # Use only for tests that are about the package relation to `pkgs` and/or NixOS. + addTestsShallowly = tests: pkg: pkg // { + tests = pkg.tests // tests; + # In case someone reads the wrong attribute + passthru.tests = pkg.tests // tests; + }; + + addFallbackPathsCheck = pkg: addTestsShallowly + { nix-fallback-paths = + runCommand "test-nix-fallback-paths-version-equals-nix-stable" { + paths = lib.concatStringsSep "\n" (builtins.attrValues (import ../../../../nixos/modules/installer/tools/nix-fallback-paths.nix)); + } '' + if [[ "" != $(grep -v 'nix-${pkg.version}$' <<< "$paths") ]]; then + echo "nix-fallback-paths not up to date with nixVersions.stable (nix-${pkg.version})" + echo "The following paths are not up to date:" + grep -v 'nix-${pkg.version}$' <<< "$paths" + echo + echo "Fix it by running in nixpkgs:" + echo + echo "curl https://releases.nixos.org/nix/nix-${pkg.version}/fallback-paths.nix >nixos/modules/installer/tools/nix-fallback-paths.nix" + echo + exit 1 + else + echo "nix-fallback-paths versions up to date" + touch $out + fi + ''; + } + pkg; + in lib.makeExtensible (self: ({ nix_2_3 = (common rec { version = "2.3.16"; @@ -203,7 +235,7 @@ in lib.makeExtensible (self: ({ else nix; - stable = self.nix_2_18; + stable = addFallbackPathsCheck self.nix_2_18; unstable = self.nix_2_18; } // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/tools/security/fscan/default.nix b/pkgs/tools/security/fscan/default.nix index 29a1c55d610..f334555ad1e 100644 --- a/pkgs/tools/security/fscan/default.nix +++ b/pkgs/tools/security/fscan/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fscan"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; rev = version; - hash = "sha256-PbhCKIr7qy4/hzx3TC7lnrQQw8rlUlprAbHdKdxgVuY="; + hash = "sha256-uoM/nMtgIqyzpOoSQKD5k4LXAXoA8G5N4In8tZlngqs="; }; - vendorHash = "sha256-pzcZgBcjGU5AyZfh+mHnphEboDDvQqseiuouwgb8rN8="; + vendorHash = "sha256-hvb2IfypwYauF3ubE36u0bTU+l/FWP/CZt6dFd9zc6s="; meta = with lib; { description = "An intranet comprehensive scanning tool"; diff --git a/pkgs/tools/security/joomscan/default.nix b/pkgs/tools/security/joomscan/default.nix new file mode 100644 index 00000000000..665df74b10b --- /dev/null +++ b/pkgs/tools/security/joomscan/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, perl, makeWrapper }: + +let + p = perl.withPackages (ps: with ps; [ LWP LWPProtocolHttps ]); +in +stdenv.mkDerivation rec { + pname = "joomscan"; + version = "unstable-2021-06-08"; + + src = fetchFromGitHub { + owner = "owasp"; + repo = pname; + rev = "79315393509caa39895e553c489667636ac31b85"; + sha256 = "Yg91iUhqbKZyPghiX0UZ7S1ql0DZLtPHOk9VEY1ZZOg="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r . $out/share/joomscan + makeWrapper ${p}/bin/perl $out/bin/joomscan.pl \ + --add-flags $out/share/joomscan/joomscan.pl + + runHook postInstall + ''; + + meta = with lib; { + description = "Joomla Vulnerability Scanner"; + homepage = "https://wiki.owasp.org/index.php/Category:OWASP_Joomla_Vulnerability_Scanner_Project"; + mainProgram = "joomscan.pl"; + maintainers = with maintainers; [ emilytrau ]; + license = licenses.gpl3Only; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index efe847e5fa0..7fa8abfeb5f 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-EtfxlSWYlfWme/t89IuvcNl11X3JL2K2rcKHAumisEw="; + hash = "sha256-5IO9CoW9KBpgVxpnH1HEC5O4MJjCPERsmiV/cHcnmAc="; }; vendorHash = "sha256-o3EHPIXGLz/io0d8jhl9cxzctP3CeOjEDMQl1SY9lXg="; diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index b0b8d8d7a70..e9094ce7103 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2ZbkghPZYRrxBS6mlwpjhwJYAcKSsUsG0V8sd3n9CZg="; + hash = "sha256-owpmQ/APTUu1V8au2UE48SIIZnVI93tlv5bhkS/2kgQ="; }; vendorHash = "sha256-dBN6Yi8HtS9LzXr08jhw1hqDwS8a4UqrYaRpM+RzvVM="; diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix index 30aecae7339..8e86415cb9e 100644 --- a/pkgs/tools/security/paperkey/default.nix +++ b/pkgs/tools/security/paperkey/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://www.jabberwocky.com/software/paperkey/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ AndersonTorres peterhoeg ]; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 41231ae1b18..133723cc391 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -70,7 +70,7 @@ let # group the specified outputs specified = builtins.partition (p: p.outputSpecified or false) all; - specifiedOutputs = builtins.groupBy (p: p.tlOutputName or p.outputName) specified.right; + specifiedOutputs = lib.groupBy (p: p.tlOutputName or p.outputName) specified.right; otherOutputNames = builtins.catAttrs "key" (builtins.genericClosure { startSet = map (key: { inherit key; }) (lib.concatLists (builtins.catAttrs "outputs" specified.wrong)); operator = _: [ ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 43fb25304da..0c1acad2e8e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ ### A ### + AusweisApp2 = ausweisapp; # Added 2023-11-08 a4term = a4; # Added 2023-10-06 aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 @@ -334,6 +335,7 @@ mapAliases ({ graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 + grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b129002b5d5..4ec31298a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9637,6 +9637,8 @@ with pkgs; john = callPackage ../tools/security/john { }; + joomscan = callPackage ../tools/security/joomscan { }; + joplin = nodePackages.joplin; joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; @@ -16221,6 +16223,7 @@ with pkgs; gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 { }; gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 { }; gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 { }; + gcc-arm-embedded-13 = callPackage ../development/compilers/gcc-arm-embedded/13 { }; gcc-arm-embedded = gcc-arm-embedded-12; # It would be better to match the default gcc so that there are no linking errors @@ -21741,8 +21744,6 @@ with pkgs; gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { }; - grilo = callPackage ../development/libraries/grilo { }; grilo-plugins = callPackage ../development/libraries/grilo-plugins { }; @@ -30549,7 +30550,7 @@ with pkgs; autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; - AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; + ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; @@ -40650,7 +40651,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_17; + nix = nixVersions.nix_2_18; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index feae7f803ea..24ffa5b3513 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -214,6 +214,7 @@ mapAliases ({ jupyter_server = jupyter-server; # added 2023-01-05 jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18 jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11 + jupyterlab_server = jupyterlab-server; # added 2023-11-12 Kajiki = kajiki; # added 2023-02-19 Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 @@ -226,6 +227,7 @@ mapAliases ({ logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 + ludios_wpull = throw "ludios_wpull has been removed because it's unmaintained and broken"; # added 2023-11-12 Mako = mako; # added 2023-02-19 Markups = markups; # added 2022-02-14 markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10 @@ -279,6 +281,7 @@ mapAliases ({ pushbullet = pushbullet-py; # Added 2022-10-15 Pweave = pweave; # added 2023-02-19 py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07 + py_stringmatching = py-stringmatching; # added 2023-11-12 pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0562fbf3b0e..d1d1b060133 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2958,6 +2958,8 @@ self: super: with self; { django-countries = callPackage ../development/python-modules/django-countries { }; + django-crispy-bootstrap4 = callPackage ../development/python-modules/django-crispy-bootstrap4 { }; + django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; django-cryptography = callPackage ../development/python-modules/django-cryptography { }; @@ -5172,6 +5174,8 @@ self: super: with self; { hvplot = callPackage ../development/python-modules/hvplot { }; + hwdata = callPackage ../development/python-modules/hwdata { }; + hwi = callPackage ../development/python-modules/hwi { }; hy = callPackage ../development/python-modules/hy { }; @@ -5825,7 +5829,7 @@ self: super: with self; { jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; - jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + jupyterlab-server = callPackage ../development/python-modules/jupyterlab-server { }; jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { }; @@ -6463,8 +6467,6 @@ self: super: with self; { luddite = callPackage ../development/python-modules/luddite { }; - ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; - luftdaten = callPackage ../development/python-modules/luftdaten { }; luhn = callPackage ../development/python-modules/luhn { }; @@ -11043,7 +11045,7 @@ self: super: with self; { pystray = callPackage ../development/python-modules/pystray { }; - py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + py-stringmatching = callPackage ../development/python-modules/py-stringmatching { }; pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { }; |