commit d0e4e9b474742efe4100f26d46394e51ab8a8182 · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/version-management/git-and-tools/thicket/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       -
       , crystal_0_33

     

       3
       3
       +
       , crystal_1_0

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         crystal = crystal_0_33;

     

       7
       7
       +
         crystal = crystal_1_0;

     

       8
       8
        
       

     

       9
       9
        
       in crystal.buildCrystalPackage rec {

     

       10
       10
        
         pname = "thicket";

+2 -2

pkgs/applications/version-management/git-and-tools/thicket/shards.nix

···

       2
       2
        
         ameba = {

     

       3
       3
        
           owner = "veelenga";

     

       4
       4
        
           repo = "ameba";

     

       5
       5
       -
           rev = "v0.10.0";

     

       6
       6
       -
           sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912";

     

       5
       5
       +
           rev = "v0.14.3";

     

       6
       6
       +
           sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1";

     

       7
       7
        
         };

     

       8
       8
        
       }

+3 -4

pkgs/development/compilers/crystal/build-package.nix

···

       10
       10
        
       , format ? "make"

     

       11
       11
        
       , installManPages ? true

     

       12
       12
        
         # Specify binaries to build in the form { foo.src = "src/foo.cr"; }

     

       13
       13
       -
         # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; }

     

       13
       13
       +
         # The default `crystal build` options can be overridden with { foo.options = [ "--optionname" ]; }

     

       14
       14
        
       , crystalBinaries ? { }

     

       15
       15
        
       , ...

     

       16
       16
        
       }@args:

     
···

       32
       32
        
           })

     

       33
       33
        
           (import shardsFile));

     

       34
       34
        
       

     

       35
       35
       -
         # we previously had --no-debug here but that is not recommended by upstream

     

       36
       36
       -
         defaultOptions = [ "--release" "--progress" "--verbose" ];

     

       35
       35
       +
         defaultOptions = [ "--release" "--progress" "--verbose" "--no-debug" ];

     

       37
       36
        
       

     

       38
       37
        
         buildDirectly = shardsFile == null || crystalBinaries != { };

     

       39
       38
        
       

     
···

       120
       119
        
       

     

       121
       120
        
         installCheckPhase = args.installCheckPhase or ''

     

       122
       121
        
           for f in $out/bin/*; do

     

       123
       123
       -
             $f --help

     

       122
       122
       +
             $f --help > /dev/null

     

       124
       123
        
           done

     

       125
       124
        
         '';

     

       126
       125

+24 -60

pkgs/development/compilers/crystal/default.nix

···

       56
       56
        
             buildCommand = ''

     

       57
       57
        
               mkdir -p $out

     

       58
       58
        
               tar --strip-components=1 -C $out -xf ${src}

     

       59
       59
       +
               patchShebangs $out/bin/crystal

     

       59
       60
        
             '';

     

       60
       61
        
           };

     

       61
       62
        
       

     
···

       93
       94
        
             outputs = [ "out" "lib" "bin" ];

     

       94
       95
        
       

     

       95
       96
        
             postPatch = ''

     

       97
       97
       +
               export TMP=$(mktemp -d)

     

       98
       98
       +
               export HOME=$TMP

     

       99
       99
       +
               mkdir -p $HOME/test

     

       100
       100
       +
       

     

       96
       101
        
               # Add dependency of crystal to docs to avoid issue on flag changes between releases

     

       97
       102
        
               # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782

     

       98
       103
        
               substituteInPlace Makefile \

     
···

       103
       108
        
       

     

       104
       109
        
               ln -sf spec/compiler spec/std

     

       105
       110
        
       

     

       106
       106
       -
               # Dirty fix for when no sandboxing is enabled

     

       107
       107
       -
               rm -rf /tmp/crystal

     

       108
       108
       -
               mkdir -p /tmp/crystal

     

       111
       111
       +
               mkdir -p $TMP/crystal

     

       109
       112
        
       

     

       110
       113
        
               substituteInPlace spec/std/file_spec.cr \

     

       111
       114
        
                 --replace '/bin/ls' '${coreutils}/bin/ls' \

     

       112
       112
       -
                 --replace '/usr/share' '/tmp/crystal' \

     

       113
       113
       -
                 --replace '/usr' '/tmp'

     

       115
       115
       +
                 --replace '/usr/share' "$TMP/crystal" \

     

       116
       116
       +
                 --replace '/usr' "$TMP" \

     

       117
       117
       +
                 --replace '/tmp' "$TMP"

     

       114
       118
        
       

     

       115
       119
        
               substituteInPlace spec/std/process_spec.cr \

     

       116
       120
        
                 --replace '/bin/cat' '${coreutils}/bin/cat' \

     

       117
       121
        
                 --replace '/bin/ls' '${coreutils}/bin/ls' \

     

       118
       122
        
                 --replace '/usr/bin/env' '${coreutils}/bin/env' \

     

       119
       123
        
                 --replace '"env"' '"${coreutils}/bin/env"' \

     

       120
       120
       -
                 --replace '"/usr"' '"/tmp"'

     

       121
       121
       -
       

     

       122
       122
       -
               substituteInPlace spec/std/socket/tcp_server_spec.cr \

     

       123
       123
       -
                 --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "'

     

       124
       124
       +
                 --replace '/usr' "$TMP" \

     

       125
       125
       +
                 --replace '/tmp' "$TMP"

     

       124
       126
        
       

     

       125
       127
        
               substituteInPlace spec/std/system_spec.cr \

     

       126
       128
        
                 --replace '`hostname`' '`${hostname}/bin/hostname`'

     

       127
       129
        
       

     

       128
       128
       -
               # See https://github.com/crystal-lang/crystal/pull/8640

     

       129
       129
       -
               substituteInPlace spec/std/http/cookie_spec.cr \

     

       130
       130
       -
                 --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}'

     

       131
       131
       -
       

     

       132
       130
        
               # See https://github.com/crystal-lang/crystal/issues/8629

     

       133
       131
        
               substituteInPlace spec/std/socket/udp_socket_spec.cr \

     

       134
       132
        
                 --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"'

     

       133
       133
       +
             '';

     

       135
       134
        
       

     

       136
       136
       -
               # See https://github.com/crystal-lang/crystal/pull/8699

     

       137
       137
       -
               substituteInPlace spec/std/xml/xml_spec.cr \

     

       138
       138
       -
                 --replace 'it "handles errors"' 'pending "handles errors"'

     

       135
       135
       +
             # Defaults are 4

     

       136
       136
       +
             preBuild = ''

     

       137
       137
       +
               export CRYSTAL_WORKERS=$NIX_BUILD_CORES

     

       138
       138
       +
               export threads=$NIX_BUILD_CORES

     

       139
       139
       +
               export CRYSTAL_CACHE_DIR=$TMP

     

       139
       140
        
             '';

     

       140
       141
        
       

     

       141
       142
        
             buildInputs = commonBuildInputs extraBuildInputs;

     
···

       197
       198
        
             checkTarget = "compiler_spec";

     

       198
       199
        
       

     

       199
       200
        
             preCheck = ''

     

       200
       200
       -
               export HOME=/tmp

     

       201
       201
       -
               mkdir -p $HOME/test

     

       202
       202
       -
       

     

       203
       201
        
               export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH

     

       204
       202
        
               export PATH=${lib.makeBinPath checkInputs}:$PATH

     

       205
       203
        
             '';

     
···

       214
       212
        
               license = licenses.asl20;

     

       215
       213
        
               maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];

     

       216
       214
        
               platforms = builtins.attrNames archs;

     

       217
       217
       -
               # Error running at_exit handler: Nil assertion failed

     

       218
       218
       -
               broken = lib.versions.minor version == "32" && stdenv.isDarwin;

     

       215
       215
       +
               broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin;

     

       219
       216
        
             };

     

       220
       217
        
           })

     

       221
       218
        
         );

     

       222
       219
        
       

     

       223
       220
        
       in

     

       224
       221
        
       rec {

     

       225
       225
       -
         binaryCrystal_0_31 = genericBinary {

     

       226
       226
       -
           version = "0.31.1";

     

       222
       222
       +
         binaryCrystal_0_36 = genericBinary {

     

       223
       223
       +
           version = "0.36.1";

     

       227
       224
        
           sha256s = {

     

       228
       228
       -
             x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih";

     

       229
       229
       -
             i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr";

     

       230
       230
       -
             x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz";

     

       225
       225
       +
             x86_64-linux = "065vzq34g7hgzl2mrzy9gwwsfikc78nj7xxsbrk67r6rz0a7bk1q";

     

       226
       226
       +
             i686-linux = "18m4b1lnd682i5ygbg6cljqjny60nn2mlrzrk765h2ip6fljqbm1";

     

       227
       227
       +
             x86_64-darwin = "0xggayk92zh64pb5sz77n12hkcd1hg8kw90z7gb18594q551sf1v";

     

       231
       228
        
           };

     

       232
       229
        
         };

     

       233
       230
        
       

     

       234
       234
       -
         crystal_0_31 = generic {

     

       235
       235
       -
           version = "0.31.1";

     

       236
       236
       -
           sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8";

     

       237
       237
       -
           doCheck = false; # 5 checks are failing now

     

       238
       238
       -
           binary = binaryCrystal_0_31;

     

       239
       239
       -
         };

     

       240
       240
       -
       

     

       241
       241
       -
         crystal_0_32 = generic {

     

       242
       242
       -
           version = "0.32.1";

     

       243
       243
       -
           sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6";

     

       244
       244
       -
           binary = crystal_0_31;

     

       245
       245
       -
         };

     

       246
       246
       -
       

     

       247
       247
       -
         crystal_0_33 = generic {

     

       248
       248
       -
           version = "0.33.0";

     

       249
       249
       -
           sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi";

     

       250
       250
       -
           binary = crystal_0_32;

     

       251
       251
       -
         };

     

       252
       252
       -
       

     

       253
       253
       -
         crystal_0_34 = generic {

     

       254
       254
       -
           version = "0.34.0";

     

       255
       255
       -
           sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4";

     

       256
       256
       -
           binary = crystal_0_33;

     

       257
       257
       -
         };

     

       258
       258
       -
       

     

       259
       259
       -
         crystal_0_35 = generic {

     

       260
       260
       -
           version = "0.35.1";

     

       261
       261
       -
           sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69";

     

       262
       262
       -
           binary = crystal_0_34;

     

       263
       263
       -
           # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789

     

       264
       264
       -
           extraBuildInputs = [ git ];

     

       265
       265
       -
         };

     

       266
       266
       -
       

     

       267
       231
        
         crystal_0_36 = generic {

     

       268
       232
        
           version = "0.36.1";

     

       269
       233
        
           sha256 = "sha256-5rjrvwZKM4lHpmxLyUVbi0Zw98xT+iJKonxwfUwS/Wk=";

     

       270
       270
       -
           binary = crystal_0_35;

     

       234
       234
       +
           binary = binaryCrystal_0_36;

     

       271
       235
        
         };

     

       272
       236
        
       

     

       273
       237
        
         crystal_1_0 = generic {

+5 -12

pkgs/development/tools/build-managers/shards/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitHub

     

       3
       3
       -
       , crystal_0_34

     

       4
       4
       -
       , crystal_0_36

     

       3
       3
       +
       , crystal_1_0

     

       5
       4
        
       }:

     

       6
       5
        
       let

     

       7
       6
        
         generic =

     
···

       36
       35
        
       

     

       37
       36
        
       in

     

       38
       37
        
       rec {

     

       39
       39
       -
         # needed for anything that requires the old v1 shards format

     

       40
       40
       -
         shards_0_11 = generic {

     

       41
       41
       -
           version = "0.11.1";

     

       42
       42
       -
           sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71";

     

       43
       43
       -
           crystal = crystal_0_34;

     

       44
       44
       -
         };

     

       45
       38
        
       

     

       46
       46
       -
         shards_0_14 = generic {

     

       47
       47
       -
           version = "0.14.1";

     

       39
       39
       +
         shards_0_15 = generic {

     

       40
       40
       +
           version = "0.15.0";

     

       48
       41
        
           sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU=";

     

       49
       49
       -
           crystal = crystal_0_36;

     

       42
       42
       +
           crystal = crystal_1_0;

     

       50
       43
        
         };

     

       51
       44
        
       

     

       52
       52
       -
         shards = shards_0_14;

     

       45
       45
       +
         shards = shards_0_15;

     

       53
       46
        
       }

+1 -5

pkgs/top-level/all-packages.nix

···

       11120
       11120
        
         inherit (callPackages ../development/compilers/crystal {

     

       11121
       11121
        
           llvmPackages = llvmPackages_10;

     

       11122
       11122
        
         })

     

       11123
       11123
       -
           crystal_0_33

     

       11124
       11124
       -
           crystal_0_34

     

       11125
       11125
       -
           crystal_0_35

     

       11126
       11123
        
           crystal_0_36

     

       11127
       11124
        
           crystal_1_0

     

       11128
       11125
        
           crystal;

     
···

       14723
       14720
        
         shallot = callPackage ../tools/misc/shallot { };

     

       14724
       14721
        
       

     

       14725
       14722
        
         inherit (callPackage ../development/tools/build-managers/shards { })

     

       14726
       14726
       -
           shards_0_11

     

       14727
       14727
       -
           shards_0_14

     

       14723
       14723
       +
           shards_0_15

     

       14728
       14724
        
           shards;

     

       14729
       14725
        
       

     

       14730
       14726
        
         shellcheck = callPackage ../development/tools/shellcheck {};