Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 9c688591 dc802b2e

+302 -42
+7
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 98 <link linkend="opt-snapraid.enable">snapraid</link>. 99 </para> 100 </listitem> 101 </itemizedlist> 102 </section> 103 <section xml:id="sec-release-21.11-incompatibilities">
··· 98 <link linkend="opt-snapraid.enable">snapraid</link>. 99 </para> 100 </listitem> 101 + <listitem> 102 + <para> 103 + <link xlink:href="https://github.com/hockeypuck/hockeypuck">Hockeypuck</link>, 104 + a OpenPGP Key Server. Available as 105 + <link linkend="opt-services.hockeypuck.enable">services.hockeypuck</link>. 106 + </para> 107 + </listitem> 108 </itemizedlist> 109 </section> 110 <section xml:id="sec-release-21.11-incompatibilities">
+2
nixos/doc/manual/release-notes/rl-2111.section.md
··· 30 - [snapraid](https://www.snapraid.it/), a backup program for disk arrays. 31 Available as [snapraid](#opt-snapraid.enable). 32 33 34 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} 35
··· 30 - [snapraid](https://www.snapraid.it/), a backup program for disk arrays. 31 Available as [snapraid](#opt-snapraid.enable). 32 33 + - [Hockeypuck](https://github.com/hockeypuck/hockeypuck), a OpenPGP Key Server. Available as [services.hockeypuck](#opt-services.hockeypuck.enable). 34 + 35 36 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} 37
+1
nixos/modules/module-list.nix
··· 886 ./services/security/fprot.nix 887 ./services/security/haka.nix 888 ./services/security/haveged.nix 889 ./services/security/hologram-server.nix 890 ./services/security/hologram-agent.nix 891 ./services/security/munge.nix
··· 886 ./services/security/fprot.nix 887 ./services/security/haka.nix 888 ./services/security/haveged.nix 889 + ./services/security/hockeypuck.nix 890 ./services/security/hologram-server.nix 891 ./services/security/hologram-agent.nix 892 ./services/security/munge.nix
+104
nixos/modules/services/security/hockeypuck.nix
···
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + let 4 + cfg = config.services.hockeypuck; 5 + settingsFormat = pkgs.formats.toml { }; 6 + in { 7 + meta.maintainers = with lib.maintainers; [ etu ]; 8 + 9 + options.services.hockeypuck = { 10 + enable = lib.mkEnableOption "Hockeypuck OpenPGP Key Server"; 11 + 12 + port = lib.mkOption { 13 + default = 11371; 14 + type = lib.types.port; 15 + description = "HKP port to listen on."; 16 + }; 17 + 18 + settings = lib.mkOption { 19 + type = settingsFormat.type; 20 + default = { }; 21 + example = lib.literalExample '' 22 + { 23 + hockeypuck = { 24 + loglevel = "INFO"; 25 + logfile = "/var/log/hockeypuck/hockeypuck.log"; 26 + indexTemplate = "''${pkgs.hockeypuck-web}/share/templates/index.html.tmpl"; 27 + vindexTemplate = "''${pkgs.hockeypuck-web}/share/templates/index.html.tmpl"; 28 + statsTemplate = "''${pkgs.hockeypuck-web}/share/templates/stats.html.tmpl"; 29 + webroot = "''${pkgs.hockeypuck-web}/share/webroot"; 30 + 31 + hkp.bind = ":''${toString cfg.port}"; 32 + 33 + openpgp.db = { 34 + driver = "postgres-jsonb"; 35 + dsn = "database=hockeypuck host=/var/run/postgresql sslmode=disable"; 36 + }; 37 + }; 38 + } 39 + ''; 40 + description = '' 41 + Configuration file for hockeypuck, here you can override 42 + certain settings (<literal>loglevel</literal> and 43 + <literal>openpgp.db.dsn</literal>) by just setting those values. 44 + 45 + For other settings you need to use lib.mkForce to override them. 46 + 47 + This service doesn't provision or enable postgres on your 48 + system, it rather assumes that you enable postgres and create 49 + the database yourself. 50 + 51 + Example: 52 + <literal> 53 + services.postgresql = { 54 + enable = true; 55 + ensureDatabases = [ "hockeypuck" ]; 56 + ensureUsers = [{ 57 + name = "hockeypuck"; 58 + ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; 59 + }]; 60 + }; 61 + </literal> 62 + ''; 63 + }; 64 + }; 65 + 66 + config = lib.mkIf cfg.enable { 67 + services.hockeypuck.settings.hockeypuck = { 68 + loglevel = lib.mkDefault "INFO"; 69 + logfile = "/var/log/hockeypuck/hockeypuck.log"; 70 + indexTemplate = "${pkgs.hockeypuck-web}/share/templates/index.html.tmpl"; 71 + vindexTemplate = "${pkgs.hockeypuck-web}/share/templates/index.html.tmpl"; 72 + statsTemplate = "${pkgs.hockeypuck-web}/share/templates/stats.html.tmpl"; 73 + webroot = "${pkgs.hockeypuck-web}/share/webroot"; 74 + 75 + hkp.bind = ":${toString cfg.port}"; 76 + 77 + openpgp.db = { 78 + driver = "postgres-jsonb"; 79 + dsn = lib.mkDefault "database=hockeypuck host=/var/run/postgresql sslmode=disable"; 80 + }; 81 + }; 82 + 83 + users.users.hockeypuck = { 84 + isSystemUser = true; 85 + description = "Hockeypuck user"; 86 + }; 87 + 88 + systemd.services.hockeypuck = { 89 + description = "Hockeypuck OpenPGP Key Server"; 90 + after = [ "network.target" "postgresql.target" ]; 91 + wantedBy = [ "multi-user.target" ]; 92 + serviceConfig = { 93 + WorkingDirectory = "/var/lib/hockeypuck"; 94 + User = "hockeypuck"; 95 + ExecStart = "${pkgs.hockeypuck}/bin/hockeypuck -config ${settingsFormat.generate "config.toml" cfg.settings}"; 96 + Restart = "always"; 97 + RestartSec = "5s"; 98 + LogsDirectory = "hockeypuck"; 99 + LogsDirectoryMode = "0755"; 100 + StateDirectory = "hockeypuck"; 101 + }; 102 + }; 103 + }; 104 + }
+1
nixos/tests/all-tests.nix
··· 174 hitch = handleTest ./hitch {}; 175 hledger-web = handleTest ./hledger-web.nix {}; 176 hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; 177 home-assistant = handleTest ./home-assistant.nix {}; 178 hostname = handleTest ./hostname.nix {}; 179 hound = handleTest ./hound.nix {};
··· 174 hitch = handleTest ./hitch {}; 175 hledger-web = handleTest ./hledger-web.nix {}; 176 hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; 177 + hockeypuck = handleTest ./hockeypuck.nix { }; 178 home-assistant = handleTest ./home-assistant.nix {}; 179 hostname = handleTest ./hostname.nix {}; 180 hound = handleTest ./hound.nix {};
+63
nixos/tests/hockeypuck.nix
···
··· 1 + import ./make-test-python.nix ({ lib, pkgs, ... }: 2 + let 3 + gpgKeyring = (pkgs.runCommandNoCC "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' 4 + mkdir -p $out 5 + export GNUPGHOME=$out 6 + cat > foo <<EOF 7 + %echo Generating a basic OpenPGP key 8 + %no-protection 9 + Key-Type: DSA 10 + Key-Length: 1024 11 + Subkey-Type: ELG-E 12 + Subkey-Length: 1024 13 + Name-Real: Foo Example 14 + Name-Email: foo@example.org 15 + Expire-Date: 0 16 + # Do a commit here, so that we can later print "done" 17 + %commit 18 + %echo done 19 + EOF 20 + gpg --batch --generate-key foo 21 + rm $out/S.gpg-agent $out/S.gpg-agent.* 22 + ''); 23 + in { 24 + name = "hockeypuck"; 25 + meta.maintainers = with lib.maintainers; [ etu ]; 26 + 27 + machine = { ... }: { 28 + # Used for test 29 + environment.systemPackages = [ pkgs.gnupg ]; 30 + 31 + services.hockeypuck.enable = true; 32 + 33 + services.postgresql = { 34 + enable = true; 35 + ensureDatabases = [ "hockeypuck" ]; 36 + ensureUsers = [{ 37 + name = "hockeypuck"; 38 + ensurePermissions."DATABASE hockeypuck" = "ALL PRIVILEGES"; 39 + }]; 40 + }; 41 + }; 42 + 43 + testScript = '' 44 + machine.wait_for_unit("hockeypuck.service") 45 + machine.wait_for_open_port(11371) 46 + 47 + response = machine.succeed("curl -vvv -s http://127.0.0.1:11371/") 48 + 49 + assert "<title>OpenPGP Keyserver</title>" in response, "HTML title not found" 50 + 51 + # Copy the keyring 52 + machine.succeed("cp -R ${gpgKeyring} /tmp/GNUPGHOME") 53 + 54 + # Extract our GPG key id 55 + keyId = machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --list-keys | grep dsa1024 --after-context=1 | grep -v dsa1024").strip() 56 + 57 + # Send the key to our local keyserver 58 + machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId) 59 + 60 + # Recieve the key from our local keyserver to a separate directory 61 + machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId) 62 + ''; 63 + })
+2 -2
pkgs/applications/misc/skytemple/default.nix
··· 2 3 python3Packages.buildPythonApplication rec { 4 pname = "skytemple"; 5 - version = "1.2.3"; 6 7 src = fetchFromGitHub { 8 owner = "SkyTemple"; 9 repo = pname; 10 rev = version; 11 - sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; 12 }; 13 14 buildInputs = [
··· 2 3 python3Packages.buildPythonApplication rec { 4 pname = "skytemple"; 5 + version = "1.2.5"; 6 7 src = fetchFromGitHub { 8 owner = "SkyTemple"; 9 repo = pname; 10 rev = version; 11 + sha256 = "0780517gjc97wb2g67pwdv3fz3sqxm2ica1hdbrhqm4rfbnb28xr"; 12 }; 13 14 buildInputs = [
+2 -2
pkgs/development/python-modules/skytemple-files/default.nix
··· 2 3 buildPythonPackage rec { 4 pname = "skytemple-files"; 5 - version = "1.2.3"; 6 7 src = fetchFromGitHub { 8 owner = "SkyTemple"; 9 repo = pname; 10 rev = version; 11 - sha256 = "sha256-/S0otBujwO/IMiLKgA2o8wlD6xk1/DpwOAfemojV9NU="; 12 fetchSubmodules = true; 13 }; 14
··· 2 3 buildPythonPackage rec { 4 pname = "skytemple-files"; 5 + version = "1.2.4"; 6 7 src = fetchFromGitHub { 8 owner = "SkyTemple"; 9 repo = pname; 10 rev = version; 11 + sha256 = "1i3045bqg9h7kcx83nlrm1pmikfpi817n0gb8da29m3mqzk7lwws"; 12 fetchSubmodules = true; 13 }; 14
+2 -2
pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
··· 5 6 buildPythonPackage rec { 7 pname = "skytemple-ssb-debugger"; 8 - version = "1.2.4"; 9 10 src = fetchFromGitHub { 11 owner = "SkyTemple"; 12 repo = pname; 13 rev = version; 14 - sha256 = "0jmsli3wg386y0lxwddpwp1xqxsn2bsy4d1f7dyh0jjz8lqiz03i"; 15 }; 16 17 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
··· 5 6 buildPythonPackage rec { 7 pname = "skytemple-ssb-debugger"; 8 + version = "1.2.5"; 9 10 src = fetchFromGitHub { 11 owner = "SkyTemple"; 12 repo = pname; 13 rev = version; 14 + sha256 = "0jkx75z8j03jfr9kzd40ip0fy24sfc7f2x430mf48xin272mc87q"; 15 }; 16 17 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
+44 -32
pkgs/misc/vim-plugins/generated.nix
··· 425 426 chadtree = buildVimPluginFrom2Nix { 427 pname = "chadtree"; 428 - version = "2021-07-17"; 429 src = fetchFromGitHub { 430 owner = "ms-jpq"; 431 repo = "chadtree"; 432 - rev = "fa78312b378a7d3a6cb1222d1df05c28238f888b"; 433 - sha256 = "05j42c3h374hyqqb5m7dddyh4sn08cw64nji3fnv3rk63gm2r4if"; 434 }; 435 meta.homepage = "https://github.com/ms-jpq/chadtree/"; 436 }; ··· 3144 3145 neogit = buildVimPluginFrom2Nix { 3146 pname = "neogit"; 3147 - version = "2021-07-14"; 3148 src = fetchFromGitHub { 3149 owner = "TimUntersberger"; 3150 repo = "neogit"; 3151 - rev = "bf148e2534097988e61ed334edaf31b67134369b"; 3152 - sha256 = "157k4gbs0r92zwm41hh40gqxc9774g05ngan936ivnnfg5j9igsg"; 3153 }; 3154 meta.homepage = "https://github.com/TimUntersberger/neogit/"; 3155 }; ··· 3412 src = fetchFromGitHub { 3413 owner = "shaunsingh"; 3414 repo = "nord.nvim"; 3415 - rev = "44ae0a84087135e23fb5a90c9726f8b161277652"; 3416 - sha256 = "0zhv06arl7x3wx20r26v3vc1i4909h657syrqbyh5k93n1hmc21j"; 3417 }; 3418 meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; 3419 }; ··· 3804 3805 nvim-treesitter = buildVimPluginFrom2Nix { 3806 pname = "nvim-treesitter"; 3807 - version = "2021-07-14"; 3808 src = fetchFromGitHub { 3809 owner = "nvim-treesitter"; 3810 repo = "nvim-treesitter"; 3811 - rev = "d779ee79f0426711f84b770bf6ff4afda4f41c1e"; 3812 - sha256 = "0svnb4fsqsjhlqcikq0kgrwyrqfqplgvx93mhw1qhpmwfbgqn6vi"; 3813 }; 3814 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; 3815 }; ··· 5129 5130 telescope-nvim = buildVimPluginFrom2Nix { 5131 pname = "telescope-nvim"; 5132 - version = "2021-07-17"; 5133 src = fetchFromGitHub { 5134 owner = "nvim-telescope"; 5135 repo = "telescope.nvim"; 5136 - rev = "5b597e7709eec08331ce71b45193117f6fb5626b"; 5137 - sha256 = "1lwr3gayqj6h0ha749p5dfgihjlqydgaidcnblcvvj8vi10ick35"; 5138 }; 5139 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; 5140 }; ··· 5262 5263 traces-vim = buildVimPluginFrom2Nix { 5264 pname = "traces-vim"; 5265 - version = "2021-06-16"; 5266 src = fetchFromGitHub { 5267 owner = "markonm"; 5268 repo = "traces.vim"; 5269 - rev = "e36a2e45791ef9078de781a781fec70e160044b0"; 5270 - sha256 = "1qndaqs38mgkl15n895nzjc98h2cy4gjgr3r72cpwhn9qmzhi5zc"; 5271 }; 5272 meta.homepage = "https://github.com/markonm/traces.vim/"; 5273 }; ··· 5706 5707 vim-airline = buildVimPluginFrom2Nix { 5708 pname = "vim-airline"; 5709 - version = "2021-07-11"; 5710 src = fetchFromGitHub { 5711 owner = "vim-airline"; 5712 repo = "vim-airline"; 5713 - rev = "4807a211cdfab3a5b5640111978ba301461c5ac1"; 5714 - sha256 = "1lrx54cfd9x6dx3kfz6x6jwakmkisj5y55s156fchdf83hsm967n"; 5715 }; 5716 meta.homepage = "https://github.com/vim-airline/vim-airline/"; 5717 }; ··· 6786 6787 vim-fugitive = buildVimPluginFrom2Nix { 6788 pname = "vim-fugitive"; 6789 - version = "2021-07-16"; 6790 src = fetchFromGitHub { 6791 owner = "tpope"; 6792 repo = "vim-fugitive"; 6793 - rev = "58516a13c623e6b21be6fed1f6067eed67005949"; 6794 - sha256 = "0gzdsp1gz1wpw8z47v3sr9b0ma41qnz0r4iiq0jr84srr3817zpl"; 6795 }; 6796 meta.homepage = "https://github.com/tpope/vim-fugitive/"; 6797 }; ··· 8035 meta.homepage = "https://github.com/jceb/vim-orgmode/"; 8036 }; 8037 8038 vim-osc52 = buildVimPluginFrom2Nix { 8039 pname = "vim-osc52"; 8040 version = "2020-09-19"; ··· 8349 8350 vim-puppet = buildVimPluginFrom2Nix { 8351 pname = "vim-puppet"; 8352 - version = "2021-01-30"; 8353 src = fetchFromGitHub { 8354 owner = "rodjek"; 8355 repo = "vim-puppet"; 8356 - rev = "b282072eb145c7719319bee1963c33ad876b0cea"; 8357 - sha256 = "1m6zbyg5hh3rhwq36836ldwhgcsmh4bl0lz5g4nzpc2ch83crrn8"; 8358 }; 8359 meta.homepage = "https://github.com/rodjek/vim-puppet/"; 8360 }; ··· 8505 8506 vim-ruby = buildVimPluginFrom2Nix { 8507 pname = "vim-ruby"; 8508 - version = "2021-07-07"; 8509 src = fetchFromGitHub { 8510 owner = "vim-ruby"; 8511 repo = "vim-ruby"; 8512 - rev = "0f603a17435f6b25614e70449304d38216d0e6e3"; 8513 - sha256 = "0dz4rmbifz5l03ch5rrnzb18j7kdwz1nkfz0lcvkwgxgjnrrhk15"; 8514 }; 8515 meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; 8516 }; ··· 9250 9251 vim-ultest = buildVimPluginFrom2Nix { 9252 pname = "vim-ultest"; 9253 - version = "2021-07-05"; 9254 src = fetchFromGitHub { 9255 owner = "rcarriga"; 9256 repo = "vim-ultest"; 9257 - rev = "43ec7b40a83fcde104d3e5e69a2c112f9dc52325"; 9258 - sha256 = "1q2rcqllip1raay9nj2cacn6vsairrywg7yxh783zf13n9bmr5vb"; 9259 }; 9260 meta.homepage = "https://github.com/rcarriga/vim-ultest/"; 9261 };
··· 425 426 chadtree = buildVimPluginFrom2Nix { 427 pname = "chadtree"; 428 + version = "2021-07-18"; 429 src = fetchFromGitHub { 430 owner = "ms-jpq"; 431 repo = "chadtree"; 432 + rev = "384925e0cfa87a27387357cab144fbf392e21f61"; 433 + sha256 = "01bg8h7276nidrgdgz6asvksi3m0g6jf8aw9bp0d4ng6s0gdfps2"; 434 }; 435 meta.homepage = "https://github.com/ms-jpq/chadtree/"; 436 }; ··· 3144 3145 neogit = buildVimPluginFrom2Nix { 3146 pname = "neogit"; 3147 + version = "2021-07-18"; 3148 src = fetchFromGitHub { 3149 owner = "TimUntersberger"; 3150 repo = "neogit"; 3151 + rev = "ee83d4fa8ac946e5e0064e65a5276e1ea030ae28"; 3152 + sha256 = "0mrydz0xl2yqgsp1nsz4p55mjhx7x7z7pahcq3y5mzzla687dnqg"; 3153 }; 3154 meta.homepage = "https://github.com/TimUntersberger/neogit/"; 3155 }; ··· 3412 src = fetchFromGitHub { 3413 owner = "shaunsingh"; 3414 repo = "nord.nvim"; 3415 + rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc"; 3416 + sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085"; 3417 }; 3418 meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; 3419 }; ··· 3804 3805 nvim-treesitter = buildVimPluginFrom2Nix { 3806 pname = "nvim-treesitter"; 3807 + version = "2021-07-18"; 3808 src = fetchFromGitHub { 3809 owner = "nvim-treesitter"; 3810 repo = "nvim-treesitter"; 3811 + rev = "9144ea1107ed5aaf250bffafc1f0f32fb97cce47"; 3812 + sha256 = "05apxyy0xg6llskigirglb4a73ay8cdaw2rckl2g3d6j8ry9dkc4"; 3813 }; 3814 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; 3815 }; ··· 5129 5130 telescope-nvim = buildVimPluginFrom2Nix { 5131 pname = "telescope-nvim"; 5132 + version = "2021-07-18"; 5133 src = fetchFromGitHub { 5134 owner = "nvim-telescope"; 5135 repo = "telescope.nvim"; 5136 + rev = "8c3f2b630be0241fe10709e61ee9dab473518f32"; 5137 + sha256 = "1yd1kkdp8baxrhkfsg0j0dpkprxvwi0r4xljjcdln7rpr2r0lm82"; 5138 }; 5139 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; 5140 }; ··· 5262 5263 traces-vim = buildVimPluginFrom2Nix { 5264 pname = "traces-vim"; 5265 + version = "2021-07-18"; 5266 src = fetchFromGitHub { 5267 owner = "markonm"; 5268 repo = "traces.vim"; 5269 + rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac"; 5270 + sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd"; 5271 }; 5272 meta.homepage = "https://github.com/markonm/traces.vim/"; 5273 }; ··· 5706 5707 vim-airline = buildVimPluginFrom2Nix { 5708 pname = "vim-airline"; 5709 + version = "2021-07-18"; 5710 src = fetchFromGitHub { 5711 owner = "vim-airline"; 5712 repo = "vim-airline"; 5713 + rev = "b861f9d2483a8b066f7b5b4dbae8990ff21455c5"; 5714 + sha256 = "0rz7p95ks4ymdwz7aqahc782msdz70qx25807cwvqh1gc9x887vq"; 5715 }; 5716 meta.homepage = "https://github.com/vim-airline/vim-airline/"; 5717 }; ··· 6786 6787 vim-fugitive = buildVimPluginFrom2Nix { 6788 pname = "vim-fugitive"; 6789 + version = "2021-07-17"; 6790 src = fetchFromGitHub { 6791 owner = "tpope"; 6792 repo = "vim-fugitive"; 6793 + rev = "de6495ae846b2c5913fa85d5464c036c0acdfa34"; 6794 + sha256 = "184cbh2jxwpp4zgvlfhs4qx1mr4vyq5vvv6lvk8lcng40dxfr9fg"; 6795 }; 6796 meta.homepage = "https://github.com/tpope/vim-fugitive/"; 6797 }; ··· 8035 meta.homepage = "https://github.com/jceb/vim-orgmode/"; 8036 }; 8037 8038 + vim-ormolu = buildVimPluginFrom2Nix { 8039 + pname = "vim-ormolu"; 8040 + version = "2020-11-25"; 8041 + src = fetchFromGitHub { 8042 + owner = "sdiehl"; 8043 + repo = "vim-ormolu"; 8044 + rev = "edbeb0135692345b088182963e9b229fe2235ac0"; 8045 + sha256 = "03srdix06dhz4b8g9akx448dw2rjbwj840xg7p9c5bq8kbmsjy8x"; 8046 + }; 8047 + meta.homepage = "https://github.com/sdiehl/vim-ormolu/"; 8048 + }; 8049 + 8050 vim-osc52 = buildVimPluginFrom2Nix { 8051 pname = "vim-osc52"; 8052 version = "2020-09-19"; ··· 8361 8362 vim-puppet = buildVimPluginFrom2Nix { 8363 pname = "vim-puppet"; 8364 + version = "2021-07-18"; 8365 src = fetchFromGitHub { 8366 owner = "rodjek"; 8367 repo = "vim-puppet"; 8368 + rev = "7bb7586896b7afe6e6f26bcbaf70ad8517d98018"; 8369 + sha256 = "1mqnawfpg23rwjp3zpz85s3dpspcl8zrh9dymv5p0pqbn27mlf5n"; 8370 }; 8371 meta.homepage = "https://github.com/rodjek/vim-puppet/"; 8372 }; ··· 8517 8518 vim-ruby = buildVimPluginFrom2Nix { 8519 pname = "vim-ruby"; 8520 + version = "2021-07-18"; 8521 src = fetchFromGitHub { 8522 owner = "vim-ruby"; 8523 repo = "vim-ruby"; 8524 + rev = "482e2cec5a742920eddf644f2f1efcb15f03967c"; 8525 + sha256 = "18b3hhb1sfgip80dp7wicrsqs59narj49qlmpnfhsy29imsxzb72"; 8526 }; 8527 meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; 8528 }; ··· 9262 9263 vim-ultest = buildVimPluginFrom2Nix { 9264 pname = "vim-ultest"; 9265 + version = "2021-07-18"; 9266 src = fetchFromGitHub { 9267 owner = "rcarriga"; 9268 repo = "vim-ultest"; 9269 + rev = "06f965a62c32906f220c37e7b758a275d6a992f6"; 9270 + sha256 = "0zgpp6g29n1kb0qi6n84i1d540g0xhw5bzj8kp5xsh5wlvn9h4fk"; 9271 }; 9272 meta.homepage = "https://github.com/rcarriga/vim-ultest/"; 9273 };
+1
pkgs/misc/vim-plugins/vim-plugin-names
··· 595 saltstack/salt-vim 596 samoshkin/vim-mergetool 597 sbdchd/neoformat 598 sebastianmarkow/deoplete-rust 599 SevereOverfl0w/deoplete-github 600 Shatur/neovim-ayu
··· 595 saltstack/salt-vim 596 samoshkin/vim-mergetool 597 sbdchd/neoformat 598 + sdiehl/vim-ormolu 599 sebastianmarkow/deoplete-rust 600 SevereOverfl0w/deoplete-github 601 Shatur/neovim-ayu
+1 -1
pkgs/os-specific/linux/kernel/generic.nix
··· 179 }; 180 }; # end of configfile derivation 181 182 - kernel = (callPackage ./manual-config.nix {}) { 183 inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; 184 185 config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
··· 179 }; 180 }; # end of configfile derivation 181 182 + kernel = (callPackage ./manual-config.nix { inherit buildPackages; }) { 183 inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; 184 185 config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
+21
pkgs/servers/hockeypuck/server.nix
···
··· 1 + { lib, buildGoModule, fetchFromGitHub, nixosTests }: 2 + 3 + let 4 + sources = (import ./sources.nix) { inherit fetchFromGitHub; }; 5 + in 6 + buildGoModule { 7 + inherit (sources) pname version src; 8 + 9 + modRoot = "src/hockeypuck/"; 10 + vendorSha256 = null; 11 + doCheck = false; # Uses networking for tests 12 + 13 + passthru.tests = nixosTests.hockeypuck; 14 + 15 + meta = with lib; { 16 + description = "OpenPGP Key Server"; 17 + homepage = "https://github.com/hockeypuck/hockeypuck"; 18 + license = licenses.agpl3Plus; 19 + maintainers = [ maintainers.etu ]; 20 + }; 21 + }
+16
pkgs/servers/hockeypuck/sources.nix
···
··· 1 + { fetchFromGitHub }: 2 + 3 + let 4 + pname = "hockeypuck"; 5 + version = "2.1.0"; 6 + in 7 + { 8 + inherit version pname; 9 + 10 + src = fetchFromGitHub { 11 + owner = pname; 12 + repo = pname; 13 + rev = version; 14 + sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1"; 15 + }; 16 + }
+28
pkgs/servers/hockeypuck/web.nix
···
··· 1 + { stdenv, lib, fetchFromGitHub, nixosTests }: 2 + 3 + let 4 + sources = (import ./sources.nix) { inherit fetchFromGitHub; }; 5 + in 6 + stdenv.mkDerivation { 7 + pname = "${sources.pname}-web"; 8 + 9 + inherit (sources) version src; 10 + 11 + dontBuild = true; # We should just copy the web templates 12 + 13 + installPhase = '' 14 + mkdir -p $out/share/ 15 + 16 + cp -vr contrib/webroot $out/share/ 17 + cp -vr contrib/templates $out/share/ 18 + ''; 19 + 20 + passthru.tests = nixosTests.hockeypuck; 21 + 22 + meta = with lib; { 23 + description = "OpenPGP Key Server web resources"; 24 + homepage = "https://github.com/hockeypuck/hockeypuck"; 25 + license = licenses.gpl3Plus; 26 + maintainers = [ maintainers.etu ]; 27 + }; 28 + }
+3 -3
pkgs/tools/misc/vector/default.nix
··· 28 29 rustPlatform.buildRustPackage rec { 30 pname = "vector"; 31 - version = "0.14.0"; 32 33 src = fetchFromGitHub { 34 owner = "timberio"; 35 repo = pname; 36 rev = "v${version}"; 37 - sha256 = "sha256-wtihrR19jMJ7Kgvy6XBzOUrC/WKNVl2MVx4lWgXYlvg="; 38 }; 39 40 - cargoSha256 = "sha256-VYIzAqh5Xxmn1koxhh+UDb2G3WS2UVXffuBY7h5Kr7A="; 41 nativeBuildInputs = [ pkg-config ]; 42 buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] 43 ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
··· 28 29 rustPlatform.buildRustPackage rec { 30 pname = "vector"; 31 + version = "0.15.0"; 32 33 src = fetchFromGitHub { 34 owner = "timberio"; 35 repo = pname; 36 rev = "v${version}"; 37 + sha256 = "sha256-8ZsZyV6zlMiNTVYPwqQi7F1OJ4hV33IqrrGkvUb8JaY="; 38 }; 39 40 + cargoSha256 = "sha256-t6KeyBwIfCQTfaennFiFX3K+8unFOsduBP7nRbAo9wI="; 41 nativeBuildInputs = [ pkg-config ]; 42 buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] 43 ++ lib.optional stdenv.isDarwin [ Security libiconv coreutils CoreServices ];
+4
pkgs/top-level/all-packages.nix
··· 5821 lua = lua5; 5822 }); 5823 5824 holochain-go = callPackage ../servers/holochain-go { }; 5825 5826 homesick = callPackage ../tools/misc/homesick { };
··· 5821 lua = lua5; 5822 }); 5823 5824 + hockeypuck = callPackage ../servers/hockeypuck/server.nix { }; 5825 + 5826 + hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; 5827 + 5828 holochain-go = callPackage ../servers/holochain-go { }; 5829 5830 homesick = callPackage ../tools/misc/homesick { };