diff options
18 files changed, 278 insertions, 53 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e8e8211c8d84..03e811ba9a13e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4147,6 +4147,12 @@ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE"; }]; }; + dgollings = { + email = "daniel.gollings+nixpkgs@gmail.com"; + github = "dgollings"; + githubId = 2032823; + name = "Daniel Gollings"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; @@ -9853,6 +9859,15 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luisdaranda = { + email = "luisdomingoaranda@gmail.com"; + github = "propet"; + githubId = 8515861; + name = "Luis D. Aranda Sánchez"; + keys = [{ + fingerprint = "AB7C 81F4 9E07 CC64 F3E7 BC25 DCAC C6F4 AAFC C04E"; + }]; + }; luisnquin = { email = "lpaandres2020@gmail.com"; matrix = "@luisnquin:matrix.org"; diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index a31f3511a4b23..c9da29063e1a6 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -83,6 +83,8 @@ In addition to numerous new and updated packages, this release has the following - [gitea-actions-runner](https://gitea.com/gitea/act_runner), a CI runner for Gitea/Forgejo Actions. Available as [services.gitea-actions-runner](#opt-services.gitea-actions-runner.instances). +- [evdevremapkeys](https://github.com/philipl/evdevremapkeys), a daemon to remap key events. Available as [services.evdevremapkeys](#opt-services.evdevremapkeys.enable). + - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). - [go2rtc](https://github.com/AlexxIT/go2rtc), a camera streaming appliation with support for RTSP, WebRTC, HomeKit, FFMPEG, RTMP and other protocols. Available as [services.go2rtc](options.html#opt-services.go2rtc.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3fd466bf846c7..d7a786424cd5f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -636,6 +636,7 @@ ./services/misc/etcd.nix ./services/misc/etebase-server.nix ./services/misc/etesync-dav.nix + ./services/misc/evdevremapkeys.nix ./services/misc/felix.nix ./services/misc/freeswitch.nix ./services/misc/fstrim.nix diff --git a/nixos/modules/services/misc/evdevremapkeys.nix b/nixos/modules/services/misc/evdevremapkeys.nix new file mode 100644 index 0000000000000..11ea6a5f03f23 --- /dev/null +++ b/nixos/modules/services/misc/evdevremapkeys.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + format = pkgs.formats.yaml { }; + cfg = config.services.evdevremapkeys; + +in +{ + options.services.evdevremapkeys = { + enable = mkEnableOption (lib.mdDoc ''evdevremapkeys''); + + settings = mkOption { + type = format.type; + default = { }; + description = lib.mdDoc '' + config.yaml for evdevremapkeys + ''; + }; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "uinput" ]; + services.udev.extraRules = '' + KERNEL=="uinput", MODE="0660", GROUP="input" + ''; + users.groups.evdevremapkeys = { }; + users.users.evdevremapkeys = { + description = "evdevremapkeys service user"; + group = "evdevremapkeys"; + extraGroups = [ "input" ]; + isSystemUser = true; + }; + systemd.services.evdevremapkeys = { + description = "evdevremapkeys"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + config = format.generate "config.yaml" cfg.settings; + in + { + ExecStart = "${pkgs.evdevremapkeys}/bin/evdevremapkeys --config-file ${config}"; + User = "evdevremapkeys"; + Group = "evdevremapkeys"; + StateDirectory = "evdevremapkeys"; + Restart = "always"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateNetwork = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectSystem = true; + }; + }; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6de8874ff2c0f..93c39d8c289c6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1307,8 +1307,8 @@ final: prev: src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "b41da6b0838bd07d1d241f6bc09d054dc5f551fd"; - sha256 = "04q642hjifrnhffb6vzg2km2vvw3fvghr9rh7l9s37ja4m3g2n3v"; + rev = "4a822fca87c40099a4e8b27f396e7b24114b60d0"; + sha256 = "1jw9hrb4577vn6yx037bd7diklcpkajasw7mv70mdwlxckdvvn02"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -5363,12 +5363,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2023-04-18"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "726746ed02eab2eef137a7ecceda7214fbeeec41"; - sha256 = "1p8bpa7g349zhx7z78gyxrhfrhibihd9v7p4224qzddk0pd4ibkz"; + rev = "d8c78a8435196e6884cf93360abe76bbf946e6a7"; + sha256 = "0cs4qhl9siymbpg5xw1g4h2qji2vwzy6s430pm05iyrbdrq92gwy"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -5843,12 +5843,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-07-18"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "774f5dd80d15aa11d0221aba767da699f9533e32"; - sha256 = "1q46i761h57hpcvaw37zdw5maia6mj3i81l1kfwa0b061drsr0yh"; + rev = "e76f0cb6b3ae5e990052343ebb73a5c8d8cac783"; + sha256 = "194bawzni3psgzs2aljzdm7rgxv58psm30aakrnqy6rl11sackrc"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6803,12 +6803,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-07-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "9e55fb7d6773fdeecddd87d7600ba6f3e4336e1e"; - sha256 = "1584f90f6v0iky8xzp85yywilqxgqikrlfn6wc5bkvmm17k5bx3y"; + rev = "1973cb1cdf39a3e2005326713dbb1192fd977c22"; + sha256 = "1xxn6ys2c7vmhaig9280p7zd8mqfml6d5df9dzyw814f8bp5brqm"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7115,12 +7115,12 @@ final: prev: nvim-pqf = buildVimPluginFrom2Nix { pname = "nvim-pqf"; - version = "2023-07-23"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "bd4cbf6998a68977418b0c5e8ef4ed8a8f20994f"; - sha256 = "0g9x8sh0rd021sn6nf97rnnsrpp9shps0s79g59n5mxvmdd6v6vi"; + rev = "f0ab5ea8388af8e6c1a7f7cdc07292b07c02662d"; + sha256 = "14m36146n0bbc0dfwpdyj4bcszaj31qfr7vwk70lhd1gynbsc40g"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7155,8 +7155,8 @@ final: prev: src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "c5d255e9c7df106039fdcec5e52a88d831137e9c"; - sha256 = "1izq79y1xa40525bll0hd00vnbxz4y2idjnwflz4j78sn4rb6q54"; + rev = "5a8a24a80774236bde6557ce3a98346b3e4133f9"; + sha256 = "0k9m2vmb2xhhv7a5dr1yxv7hwhwnl1x4m6f2y3caylrhdydq0l57"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7271,12 +7271,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-07-22"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7b04e8b67eec7d92daadf9f0717dd272ddfc81a3"; - sha256 = "0wlgk11y86pnb5jc6rsswyyvarfpbp5i7s4lqb7i2jz6m96min3n"; + rev = "7c1e944311a0d4eb2c8a346661ee4ed207aca514"; + sha256 = "01aw60dzgj72yk5npwwfgq7l8193kr67yypkyrc6938gdw4p3mqk"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7331,12 +7331,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-07-23"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "ef32a5c24b767d165ed63fd2b24ac8dc52742521"; - sha256 = "1jrg79hliagz408200vl4926a61c462lz5rv59xjfp70x5pbdjjd"; + rev = "9e519b6146512c8e2e702faf8ac48420f4f5deec"; + sha256 = "1asdjyk9kp4aip9qc2q6ic2jkc8g3ilzjqvxqskjc2jq21fyscp9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7930,6 +7930,18 @@ final: prev: meta.homepage = "https://github.com/sotte/presenting.vim/"; }; + preto = buildVimPluginFrom2Nix { + pname = "preto"; + version = "2023-02-10"; + src = fetchFromGitHub { + owner = "ewilazarus"; + repo = "preto"; + rev = "d7f5205ab63dcbfa80abbc18badd51aa0d9965b1"; + sha256 = "1l9s6linmjy7wlxsp4gipffnxakwvi1037phcnsr294c920d4dz5"; + }; + meta.homepage = "https://github.com/ewilazarus/preto/"; + }; + prev_indent = buildVimPluginFrom2Nix { pname = "prev_indent"; version = "2014-03-08"; @@ -8473,12 +8485,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-07-20"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "c59929296e0d6c9cee7c5aea80df22d437e734bb"; - sha256 = "0q240jnllqg6pqy8krpl73rvaxrk01fsdwclnwmj35a7lyq7m0jl"; + rev = "6a59833ea23c7dce49936a71309465ba17e9b661"; + sha256 = "0fv3rs74gz56vcishxwpjy4rzxbc58c4kpzcapmrg1ia5hrlmgzb"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8833,6 +8845,18 @@ final: prev: meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; + starrynight = buildVimPluginFrom2Nix { + pname = "starrynight"; + version = "2021-09-09"; + src = fetchFromGitHub { + owner = "josegamez82"; + repo = "starrynight"; + rev = "241a94cb0a206efc6fc5f403834c39baf7ad1176"; + sha256 = "1g2vvvvw1qg9ipfkpvijmkswa6rhh3rnizjmx1h5ghkvgxsr1ryl"; + }; + meta.homepage = "https://github.com/josegamez82/starrynight/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch.vim"; version = "2014-09-21"; @@ -9908,12 +9932,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-07-21"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "e1deb7880e88b709eb272e80c04933dd8267d5fd"; - sha256 = "1dclhnm003dd886ibrs18hdf1dgv7qx8spi8cfc95zq8s713rahb"; + rev = "6d050d5bc74645cb572c01a0a5c8d2eb28479c71"; + sha256 = "07w8lskf4scx7knkaknc9ba1g7hk3b1jmx7mn6qfxmxf4kx5i2vd"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -13233,6 +13257,18 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; + vim-paper = buildVimPluginFrom2Nix { + pname = "vim-paper"; + version = "2023-03-16"; + src = fetchFromGitHub { + owner = "yorickpeterse"; + repo = "vim-paper"; + rev = "47f6ca5452a718c2e3b95a9c75932d34b2a8f5ae"; + sha256 = "04wj853rlxm8bzzcasc1ib4npf8m81nwrqapxpmh7pv3hcg56k69"; + }; + meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; + }; + vim-parinfer = buildVimPluginFrom2Nix { pname = "vim-parinfer"; version = "2022-11-29"; @@ -14272,8 +14308,8 @@ final: prev: src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ec293a2dd675cc39a4b168c8c06638d1f53fe800"; - sha256 = "1jqhgdpp5k61ln1nvaar7gkczw0hnchx5lhzvf73vbi33jjwmk1c"; + rev = "63d317c2f6c34e561987d4ab0aa003d8391c4033"; + sha256 = "0blxanzxlszxl5yyn21wix99slgbnsdib5bc88rngsvwvr4j265k"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15013,12 +15049,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-07-22"; + version = "2023-07-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "53464eb5df497eb015da773f7a309e3bf2dfa16e"; - sha256 = "1k680xc9yy8afr7ip4fiq5bi6jsqdghg4gslgl72ddw2cd5gcjbx"; + rev = "9da5481ca32d4c903228e4e30b5d8ccdd46e6a94"; + sha256 = "1hayvndfzvr839zv76mhkqr7vyi2q3y140hxrc5vz0bkk0hc6w8w"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15336,6 +15372,18 @@ final: prev: meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yescapsquit-vim = buildVimPluginFrom2Nix { + pname = "yescapsquit.vim"; + version = "2022-08-31"; + src = fetchFromGitHub { + owner = "lucasew"; + repo = "yescapsquit.vim"; + rev = "68290b5869bebe093ccc87ee80d15688ac2b104d"; + sha256 = "1wqxmrzg111ri9wiri73kyyms0bg7jnny3d86bvlr8c0wrd5c2vb"; + }; + meta.homepage = "https://github.com/lucasew/yescapsquit.vim/"; + }; + yuck-vim = buildVimPluginFrom2Nix { pname = "yuck.vim"; version = "2022-10-29"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 49f0181c2c473..0e582bfffbb1f 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -513,12 +513,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=31552ac"; + version = "0.0.0+rev=482bdb8"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "31552ac43ecaffa443a12ebea68cc526d334892f"; - hash = "sha256-6ywdhlQGjivA2RV5345A0BiybAJOn9cIM03GMHjVoiM="; + rev = "482bdb8b8fb7305b928937379820aa6449e359a7"; + hash = "sha256-x2Cm1yUfhlkl8zgbQFPe/IxVNGpX050J3wjsqe7uOW8="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ea62e01b717b3..2247f03aba519 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -932,7 +932,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-Xlhy2yfB99Tu0j7rXRC6UkdcV0MW09olyxcC2gjd7h4="; + cargoHash = "sha256-wR1QIB4Qqw/b2f7XFbPytDSz/8BtaFep3BZuT0RJ3hg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 910d82d90ddf7..e4706a7b28534 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -666,6 +666,7 @@ https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, +https://github.com/ewilazarus/preto/,HEAD, https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, https://github.com/kevinhwang91/promise-async/,HEAD, @@ -742,6 +743,7 @@ https://github.com/chr4/sslsecure.vim/,, https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/luukvbaal/stabilize.nvim/,, https://github.com/eigenfoo/stan-vim/,, +https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, https://github.com/luukvbaal/statuscol.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, @@ -1115,6 +1117,7 @@ https://github.com/lambdalisue/vim-pager/,, https://github.com/vim-pandoc/vim-pandoc/,, https://github.com/vim-pandoc/vim-pandoc-after/,, https://github.com/vim-pandoc/vim-pandoc-syntax/,, +https://github.com/yorickpeterse/vim-paper/,HEAD, https://github.com/bhurlow/vim-parinfer/,, https://github.com/sickill/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, @@ -1291,6 +1294,7 @@ https://github.com/tweekmonster/wstrip.vim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, diff --git a/pkgs/applications/science/electronics/kingstvis/default.nix b/pkgs/applications/science/electronics/kingstvis/default.nix new file mode 100644 index 0000000000000..3699aebbbff0e --- /dev/null +++ b/pkgs/applications/science/electronics/kingstvis/default.nix @@ -0,0 +1,59 @@ +{ buildFHSEnv +, dbus +, fetchzip +, fontconfig +, freetype +, glib +, lib +, libGL +, stdenv +, xkeyboard_config +, xorg +, zlib +}: + +let + name = "kingstvis"; + version = "3.6.1"; + src = fetchzip { + url = "http://res.kingst.site/kfs/KingstVIS_v${version}.tar.gz"; + hash = "sha256-eZJ3RZWdmNx/El3Hh5kUf44pIwdvwOEkRysYBgUkS18="; + }; +in + +buildFHSEnv { + inherit name; + + targetPkgs = pkgs: (with pkgs; [ + dbus + fontconfig + freetype + glib + libGL + xkeyboard_config + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libxcb + zlib + ]); + + extraInstallCommands = '' + install -Dvm644 ${src}/Driver/99-Kingst.rules \ + $out/lib/udev/rules.d/99-Kingst.rules + ''; + + runScript = "${src}/KingstVIS"; + + meta = { + description = "Kingst Virtual Instruments Studio, software for logic analyzers"; + homepage = "http://www.qdkingst.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.luisdaranda ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/system/psitop/default.nix b/pkgs/applications/system/psitop/default.nix new file mode 100644 index 0000000000000..a3080338b89a8 --- /dev/null +++ b/pkgs/applications/system/psitop/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "psitop"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jamespwilliams"; + repo = "psitop"; + rev = version; + hash = "sha256-C8WEbA7XXohKFz7QgII0LPU1eJ4Z7CSlmEOamgo4wQI="; + }; + + vendorHash = "sha256-oLtKpBvTsM5TbzfWIDfqgb7DL5D3Mldu0oimVeiUeSc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Top for /proc/pressure"; + homepage = "https://github.com/jamespwilliams/psitop"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 2ac85084b4130..286fc8fcc9525 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V miangraham ]; + maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 13cbb66055b4a..a3ca61f986209 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.34.0"; + version = "0.34.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-nowtQbgYkXOHQcbjlPDzhJORzSla1gmUoW9qrW0QujE="; + hash = "sha256-Ktl6YVYd8QpC6eaz3Xe6YyJZhB92ZLL9/XG4WSc2qS8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index 2aabe3bcce6e4..921197407527a 100644 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -2,16 +2,17 @@ buildGoModule { pname = "protoc-gen-twirp_typescript"; - version = "unstable-2021-03-29"; + version = "unstable-2022-08-14"; src = fetchFromGitHub { owner = "larrymyers"; repo = "protoc-gen-twirp_typescript"; - rev = "97fd63e543beb2d9f6a90ff894981affe0f2faf1"; + rev = "535986b31881a214db3c04f122bcc96a2823a155"; sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + proxyVendor = true; + vendorSha256 = "sha256-UyxHa28SY60U8VeL7TbSTyscqN5T7tKGfuN2GIL6QIg"; subPackages = [ "." ]; @@ -19,6 +20,6 @@ buildGoModule { description = "Protobuf Plugin for Generating a Twirp Typescript Client"; homepage = "https://github.com/larrymyers/protoc-gen-twirp_typescript"; license = licenses.mit; - maintainers = with maintainers; [ jojosch ]; + maintainers = with maintainers; [ jojosch dgollings ]; }; } diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index fdf35471013e5..c761d887e35d9 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -97,6 +97,6 @@ in stdenv.mkDerivation { homepage = "https://www.zerotier.com"; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/age-plugin-tpm/default.nix b/pkgs/tools/security/age-plugin-tpm/default.nix index 89291096db9b6..8882a70a1a956 100644 --- a/pkgs/tools/security/age-plugin-tpm/default.nix +++ b/pkgs/tools/security/age-plugin-tpm/default.nix @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://github.com/Foxboron/age-plugin-tpm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ kranzes sgo ]; }; } diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 3200a541b163a..90999d1f88dae 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,20 +5,25 @@ buildGoModule rec { pname = "httpx"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-VYFXxCKlVqueUk/uoD15ay+IWiFKDsBHp5WXZlajw70="; + hash = "sha256-62WOeMnnr08k8pGUTqxiZqHQJxXYqUIh+PzHvJxnJAY="; }; - vendorHash = "sha256-1WamyEnDsuyv0ijHPJthS/ZZVXKrGu8LG8w5wMVoUS0="; + vendorHash = "sha256-ASOheYGuvSHEz51SGUtRGCa3Cl4x+zfIfRkS3JX6vCs="; - subPackages = [ "cmd/httpx" ]; + subPackages = [ + "cmd/httpx" + ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; # Tests require network access doCheck = false; diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index fb16526da30bb..5a087d276c006 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.8.7"; + version = "1.9.1"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-lXyluCezwg3QVYH7zctQy0yDIvGzqMPdabRh5Z7Yw/8="; + hash = "sha256-IH+dqPTtVBgIUI63tetS/s5gjleqdTEQ6iD0DeliOjY="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c0683cdba0b2..0eee895e97cb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11955,6 +11955,8 @@ with pkgs; pscircle = callPackage ../os-specific/linux/pscircle { }; + psitop = callPackage ../applications/system/psitop { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -16256,6 +16258,8 @@ with pkgs; kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; + kingstvis = callPackage ../applications/science/electronics/kingstvis { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; regenkfs = callPackage ../development/tools/knightos/regenkfs { }; |