commit 322e57fa6b4a6ec394ebbeebf8134f8a441b616d · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2411.section.md

···

       425
       425
        
       

     

       426
       426
        
       - The `shadowstack` hardening flag has been added, though disabled by default.

     

       427
       427
        
       

     

       428
       428
       +
       - `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package.

     

       429
       429
       +
       

     

       428
       430
        
       - `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups.<name>.inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep).

     

       429
       431
        
       

     

       430
       432
        
       - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872)

+50

pkgs/by-name/ti/tinyxxd/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         installShellFiles,

     

       6
       6
       +
         vim,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
       +
         pname = "tinyxxd";

     

       11
       11
       +
         version = "1.3.5";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           repo = "tinyxxd";

     

       15
       15
       +
           owner = "xyproto";

     

       16
       16
       +
           rev = "v${finalAttrs.version}";

     

       17
       17
       +
           hash = "sha256-W7BrQga98ACrhTHF3UlGQMRmcdJaxgorDP6FpD5mr2A=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         nativeBuildInputs = [ installShellFiles ];

     

       21
       21
       +
       

     

       22
       22
       +
         installFlags = [ "PREFIX=$(out)" ];

     

       23
       23
       +
       

     

       24
       24
       +
         postInstall = ''

     

       25
       25
       +
           installManPage tinyxxd.1

     

       26
       26
       +
       

     

       27
       27
       +
           # Allow using `tinyxxd` as `xxd`. This is similar to the Arch packaging.

     

       28
       28
       +
           # https://gitlab.archlinux.org/archlinux/packaging/packages/tinyxxd/-/blob/main/PKGBUILD

     

       29
       29
       +
           ln -s $out/bin/{tiny,}xxd

     

       30
       30
       +
           ln -s $out/share/man/man1/{tiny,}xxd.1.gz

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       33
       33
       +
         meta = {

     

       34
       34
       +
           homepage = "https://github.com/xyproto/tinyxxd";

     

       35
       35
       +
           description = "Drop-in replacement and standalone version of the hex dump utility that comes with ViM";

     

       36
       36
       +
           license = [

     

       37
       37
       +
             lib.licenses.mit # or

     

       38
       38
       +
             lib.licenses.gpl2Only

     

       39
       39
       +
           ];

     

       40
       40
       +
           mainProgram = "tinyxxd";

     

       41
       41
       +
           maintainers = with lib.maintainers; [

     

       42
       42
       +
             emily

     

       43
       43
       +
             philiptaron

     

       44
       44
       +
           ];

     

       45
       45
       +
           platforms = lib.platforms.unix;

     

       46
       46
       +
       

     

       47
       47
       +
           # If the two `xxd` providers are present, choose this one.

     

       48
       48
       +
           priority = (vim.xxd.meta.priority or lib.meta.defaultPriority) - 1;

     

       49
       49
       +
         };

     

       50
       50
       +
       })

+3 -3

pkgs/top-level/unixtools.nix

···

       224
       224
        
             darwin = pkgs.darwin.basic_cmds;

     

       225
       225
        
           };

     

       226
       226
        
           xxd = {

     

       227
       227
       -
             linux = pkgs.vim.xxd;

     

       228
       228
       -
             darwin = pkgs.vim.xxd;

     

       229
       229
       -
             freebsd = pkgs.vim.xxd;

     

       227
       227
       +
             linux = pkgs.tinyxxd;

     

       228
       228
       +
             darwin = pkgs.tinyxxd;

     

       229
       229
       +
             freebsd = pkgs.tinyxxd;

     

       230
       230
        
           };

     

       231
       231
        
         };

     

       232
       232