commit 49a8c118b252339d383d7dba90b707161db00ec2 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/bash/blesh.nix

···

       9
       9
        
       

     

       10
       10
        
         config = mkIf cfg.enable {

     

       11
       11
        
           programs.bash.interactiveShellInit = mkBefore ''

     

       12
       12
       -
             source ${pkgs.blesh}/share/ble.sh

     

       12
       12
       +
             source ${pkgs.blesh}/share/blesh/ble.sh

     

       13
       13
        
           '';

     

       14
       14
        
         };

     

       15
       15
        
         meta.maintainers = with maintainers; [ laalsaas ];

+27 -24

pkgs/shells/bash/blesh/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenvNoCC

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , git

     

       3
       3
       +
       , fetchzip

     

       4
       4
       +
       , runtimeShell

     

       5
       5
        
       , bashInteractive

     

       6
       6
        
       , glibcLocales

     

       7
       7
       -
       , runtimeShell

     

       8
       7
        
       }:

     

       9
       8
        
       

     

       10
       9
        
       stdenvNoCC.mkDerivation rec {

     

       11
       10
        
         name = "blesh";

     

       12
       12
       -
         version = "unstable-2022-07-24";

     

       11
       11
       +
         version = "unstable-2022-07-29";

     

       13
       12
        
       

     

       14
       14
       -
         src = fetchFromGitHub {

     

       15
       15
       -
           owner = "akinomyoga";

     

       16
       16
       -
           repo = "ble.sh";

     

       17
       17
       -
           rev = "0b95d5d900b79a63e7f0834da5aa7276b8332a44";

     

       18
       18
       -
           hash = "sha256-s/RQKcAFcCUB3Xd/4uOsIgigOE0lCCeVC9K3dfnP/EQ=";

     

       19
       19
       -
           fetchSubmodules = true;

     

       20
       20
       -
           leaveDotGit = true;

     

       13
       13
       +
         src = fetchzip {

     

       14
       14
       +
           url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20220729+a22e145.tar.xz";

     

       15
       15
       +
           sha256 = "088jv02y40pjcfzgrbx8n6aksznfh6zl0j5siwfw3pmwn3i16njw";

     

       21
       16
        
         };

     

       22
       17
        
       

     

       23
       23
       -
         nativeBuildInputs = [ git ];

     

       18
       18
       +
         dontBuild = true;

     

       24
       19
        
       

     

       25
       20
        
         doCheck = true;

     

       26
       21
        
         checkInputs = [ bashInteractive glibcLocales ];

     

       27
       22
        
         preCheck = "export LC_ALL=en_US.UTF-8";

     

       28
       23
        
       

     

       29
       29
       -
         installFlags = [ "INSDIR=$(out)/share" ];

     

       24
       24
       +
         installPhase = ''

     

       25
       25
       +
           runHook preInstall

     

       26
       26
       +
       

     

       27
       27
       +
           mkdir -p "$out/share/blesh/lib"

     

       28
       28
       +
       

     

       29
       29
       +
           cat <<EOF >"$out/share/blesh/lib/_package.sh"

     

       30
       30
       +
           _ble_base_package_type=nix

     

       31
       31
       +
       

     

       32
       32
       +
           function ble/base/package:nix/update {

     

       33
       33
       +
             echo "Ble.sh is installed by Nix. You can update it there." >&2

     

       34
       34
       +
             return 1

     

       35
       35
       +
           }

     

       36
       36
       +
           EOF

     

       37
       37
       +
       

     

       38
       38
       +
           cp -rv $src/* $out/share/blesh

     

       39
       39
       +
       

     

       40
       40
       +
           runHook postInstall

     

       41
       41
       +
         '';

     

       42
       42
       +
       

     

       30
       43
        
         postInstall = ''

     

       31
       44
        
           mkdir -p "$out/bin"

     

       32
       45
        
           cat <<EOF >"$out/bin/blesh-share"

     

       33
       46
        
           #!${runtimeShell}

     

       34
       47
        
           # Run this script to find the ble.sh shared folder

     

       35
       48
        
           # where all the shell scripts are living.

     

       36
       36
       -
           echo "$out/share/ble.sh"

     

       49
       49
       +
           echo "$out/share/blesh"

     

       37
       50
        
           EOF

     

       38
       51
        
           chmod +x "$out/bin/blesh-share"

     

       39
       39
       -
       

     

       40
       40
       -
           mkdir -p "$out/share/lib"

     

       41
       41
       -
           cat <<EOF >"$out/share/lib/_package.sh"

     

       42
       42
       -
           _ble_base_package_type=nix

     

       43
       43
       -
       

     

       44
       44
       -
           function ble/base/package:nix/update {

     

       45
       45
       -
             echo "Ble.sh is installed by Nix. You can update it there." >/dev/stderr

     

       46
       46
       -
             return 1

     

       47
       47
       -
           }

     

       48
       48
       -
           EOF

     

       49
       52
        
         '';

     

       50
       53
        
       

     

       51
       54
        
         meta = with lib; {