diff options
71 files changed, 823 insertions, 481 deletions
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 79cb09572503..0bb9959a5105 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -13,7 +13,7 @@ If you find you are lacking inspiration for packing javascript applications, the ### Github {#javascript-finding-examples-github} - Searching Nix files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+language%3ANix&type=code> -- Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+filename%3Aflake.nix&type=code> +- Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+path%3A**%2Fflake.nix&type=code> ### Gitlab {#javascript-finding-examples-gitlab} diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4aa8608da7aa..85ff0ec04f4e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3692,6 +3692,12 @@ githubId = 1222362; name = "MatÃas Lang"; }; + criyle = { + email = "i+nixos@goj.ac"; + name = "Yang Gao"; + githubId = 6821729; + github = "criyle"; + }; CRTified = { email = "carl.schneider+nixos@rub.de"; matrix = "@schnecfk:ruhr-uni-bochum.de"; diff --git a/nixos/modules/services/misc/soft-serve.nix b/nixos/modules/services/misc/soft-serve.nix index 0f246493880b..2b63b6bcd867 100644 --- a/nixos/modules/services/misc/soft-serve.nix +++ b/nixos/modules/services/misc/soft-serve.nix @@ -12,7 +12,7 @@ in { options = { services.soft-serve = { - enable = mkEnableOption "Enable soft-serve service"; + enable = mkEnableOption "soft-serve"; package = mkPackageOption pkgs "soft-serve" { }; @@ -20,7 +20,7 @@ in type = format.type; default = { }; description = mdDoc '' - The contents of the configuration file. + The contents of the configuration file for soft-serve. See <${docUrl}>. ''; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 25367f8e61d4..3a2744303474 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -109,11 +109,10 @@ let getGutenprint = pkgs: head (filterGutenprint pkgs); parsePorts = addresses: let - splitAddress = addr: lib.strings.splitString ":" addr; - extractPort = addr: builtins.elemAt (builtins.tail (splitAddress addr)) 0; - toInt = str: lib.strings.toInt str; + splitAddress = addr: strings.splitString ":" addr; + extractPort = addr: builtins.foldl' (a: b: b) "" (splitAddress addr); in - builtins.map (address: toInt (extractPort address)) addresses; + builtins.map (address: strings.toInt (extractPort address)) addresses; in diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4bad56991cc6..bccfe998f61a 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1318,12 +1318,12 @@ let wait_for_open_port(9374) wait_until_succeeds( "curl -sSf localhost:9374/metrics | grep '{}' | grep -v ' 0$'".format( - 'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1"} ' + 'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source=""} ' ) ) wait_until_succeeds( "curl -sSf localhost:9374/metrics | grep '{}'".format( - 'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1"}' + 'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source=""}' ) ) ''; diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/applications/audio/xtuner/default.nix index c51852179114..1fdb97f6dad4 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 46b389ab8059..ac3dabe5436e 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"; - |