commit a8ada7ce4a26f364dfc63a119ad6160f01b86988 · pyrox.dev/nixpkgs

+48

pkgs/by-name/al/alan_2/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       stdenv.mkDerivation {

     

       8
       8
       +
         pname = "alan2";

     

       9
       9
       +
         version = "2.8.7";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "alan-if";

     

       13
       13
       +
           repo = "alan";

     

       14
       14
       +
           rev = "71f23ec79f7f5d66aa5ae9fd3f9b8dae41a89f15";

     

       15
       15
       +
           hash = "sha256-lqrMnfANgQtXTAmzxzHaJMAyqHNOdrerjtrs8LGd0hg=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         makefile = "Makefile.unix";

     

       19
       19
       +
       

     

       20
       20
       +
         env.NIX_CFLAGS_COMPILE = toString [

     

       21
       21
       +
           # Add a workaround for -fno-common toolchains like upstream gcc-10.

     

       22
       22
       +
           # alan-3 is already fixed, but the backport is nontrivial.

     

       23
       23
       +
           "-fcommon"

     

       24
       24
       +
           # smScSema.c:142:11: error: assignment to 'unsigned char *' from incompatible pointer type 'unsigned char **' [-Wincompatible-pointer-types]

     

       25
       25
       +
           "-Wno-error=incompatible-pointer-types"

     

       26
       26
       +
           # smScSema.c:183:10: error: implicit declaration of function 'read'; did you mean 'fread'? [-Wimplicit-function-declaration]

     

       27
       27
       +
           "-Wno-error=implicit-function-declaration"

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         installPhase = ''

     

       31
       31
       +
           runHook preInstall

     

       32
       32
       +
       

     

       33
       33
       +
           mkdir -p $out/bin $out/share/alan2

     

       34
       34
       +
           cp compiler/alan $out/bin/alan2

     

       35
       35
       +
           cp interpreter/arun $out/bin/arun2

     

       36
       36
       +
           cp alan.readme ChangeLog $out/share/alan2

     

       37
       37
       +
       

     

       38
       38
       +
           runHook postInstall

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         meta = {

     

       42
       42
       +
           homepage = "https://www.alanif.se/";

     

       43
       43
       +
           description = "Alan interactive fiction language (legacy version)";

     

       44
       44
       +
           license = lib.licenses.artistic2;

     

       45
       45
       +
           platforms = lib.platforms.linux;

     

       46
       46
       +
           maintainers = with lib.maintainers; [ neilmayhew ];

     

       47
       47
       +
         };

     

       48
       48
       +
       }

-38

pkgs/development/compilers/alan/2.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       stdenv.mkDerivation {

     

       8
       8
       -
         pname = "alan2";

     

       9
       9
       -
         version = "2.8.7";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchFromGitHub {

     

       12
       12
       -
           owner = "alan-if";

     

       13
       13
       -
           repo = "alan";

     

       14
       14
       -
           rev = "71f23ec79f7f5d66aa5ae9fd3f9b8dae41a89f15";

     

       15
       15
       -
           sha256 = "066jknqz1v6sismvfxjfffl35h14v8qwgcq99ibhp08dy2fwraln";

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         makefile = "Makefile.unix";

     

       19
       19
       -
       

     

       20
       20
       -
         # Add a workarounf for -fno-common tollchains like upstream gcc-10.

     

       21
       21
       -
         # alan-3 is already fixed, but the backport is nontrivial.

     

       22
       22
       -
         env.NIX_CFLAGS_COMPILE = "-fcommon";

     

       23
       23
       -
       

     

       24
       24
       -
         installPhase = ''

     

       25
       25
       -
           mkdir -p $out/bin $out/share/alan2

     

       26
       26
       -
           cp compiler/alan $out/bin/alan2

     

       27
       27
       -
           cp interpreter/arun $out/bin/arun2

     

       28
       28
       -
           cp alan.readme ChangeLog $out/share/alan2

     

       29
       29
       -
         '';

     

       30
       30
       -
       

     

       31
       31
       -
         meta = with lib; {

     

       32
       32
       -
           homepage = "https://www.alanif.se/";

     

       33
       33
       -
           description = "Alan interactive fiction language (legacy version)";

     

       34
       34
       -
           license = licenses.artistic2;

     

       35
       35
       -
           platforms = platforms.linux;

     

       36
       36
       -
           maintainers = with maintainers; [ neilmayhew ];

     

       37
       37
       -
         };

     

       38
       38
       -
       }

+12 -8

pkgs/development/compilers/alan/default.nix pkgs/by-name/al/alan/package.nix

···

       8
       8
        
         which,

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       stdenv.mkDerivation rec {

     

       11
       11
       +
       stdenv.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "alan";

     

       13
       13
        
         version = "3.0beta8";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "alan-if";

     

       17
       17
        
           repo = "alan";

     

       18
       18
       -
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "0zfg1frmb4yl39hk8h733bmlwk4rkikzfhvv7j34cxpdpsp7spzl";

     

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

     

       19
       19
       +
           sha256 = "sha256-9F99rr7tdkaGPHtD92ecmUxO6xrjQDRhGtSTVbMLz30=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         postPatch = ''

     
···

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         installPhase = ''

     

       30
       30
       +
           runHook preInstall

     

       31
       31
       +
       

     

       30
       32
        
           mkdir -p $out/bin $out/share/alan/examples

     

       31
       33
        
           # Build the release tarball

     

       32
       34
        
           make package

     
···

       37
       39
        
           mv $out/share/alan/{alan,arun} $out/bin

     

       38
       40
        
           # a2a3 isn't included in the release tarball

     

       39
       41
        
           cp bin/a2a3 $out/bin

     

       42
       42
       +
       

     

       43
       43
       +
           runHook postInstall

     

       40
       44
        
         '';

     

       41
       45
        
       

     

       42
       46
        
         nativeBuildInputs = [

     
···

       46
       50
        
           which

     

       47
       51
        
         ];

     

       48
       52
        
       

     

       49
       49
       -
         meta = with lib; {

     

       53
       53
       +
         meta = {

     

       50
       54
        
           homepage = "https://www.alanif.se/";

     

       51
       55
        
           description = "Alan interactive fiction language";

     

       52
       52
       -
           license = licenses.artistic2;

     

       53
       53
       -
           platforms = platforms.linux;

     

       54
       54
       -
           maintainers = with maintainers; [ neilmayhew ];

     

       56
       56
       +
           license = lib.licenses.artistic2;

     

       57
       57
       +
           platforms = lib.platforms.linux;

     

       58
       58
       +
           maintainers = with lib.maintainers; [ neilmayhew ];

     

       55
       59
        
         };

     

       56
       56
       -
       }

     

       60
       60
       +
       })

-4

pkgs/top-level/all-packages.nix

···

       5721
       5721
        
           jdk = jdk8;

     

       5722
       5722
        
         };

     

       5723
       5723
        
       

     

       5724
       5724
       -
         alan = callPackage ../development/compilers/alan { };

     

       5725
       5725
       -
       

     

       5726
       5726
       -
         alan_2 = callPackage ../development/compilers/alan/2.nix { };

     

       5727
       5727
       -
       

     

       5728
       5724
        
         armips = callPackage ../development/compilers/armips {

     

       5729
       5725
        
           stdenv = gcc10Stdenv;

     

       5730
       5726
        
         };