commit 235ddf16a62304fa4cc89599ce14ed082056dbeb · pyrox.dev/nixpkgs

+2 -1

pkgs/development/compilers/gcc/common/dependencies.nix

···

       15
       15
        
         libucontext ? null,

     

       16
       16
        
         libxcrypt ? null,

     

       17
       17
        
         darwin ? null,

     

       18
       18
       +
         isSnapshot ? false,

     

       18
       19
        
         isl ? null,

     

       19
       20
        
         zlib ? null,

     

       20
       21
        
         gnat-bootstrap ? null,

     
···

       44
       45
        
             gettext

     

       45
       46
        
           ]

     

       46
       47
        
           ++ optionals (perl != null) [ perl ]

     

       47
       47
       -
           ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox && flex != null) [ flex ]

     

       48
       48
       +
           ++ optionals (with stdenv.targetPlatform; isVc4 || isRedox || isSnapshot && flex != null) [ flex ]

     

       48
       49
        
           ++ optionals langAda [ gnat-bootstrap ]

     

       49
       50
        
           ++ optionals langRust [ cargo ]

     

       50
       51
        
           # The builder relies on GNU sed (for instance, Darwin's `sed' fails with

+34 -29

pkgs/development/compilers/gcc/default.nix

···

       40
       40
        
         libcCross ? null,

     

       41
       41
        
         threadsCross ? null, # for MinGW

     

       42
       42
        
         withoutTargetLibc ? false,

     

       43
       43
       +
         flex,

     

       43
       44
        
         gnused ? null,

     

       44
       45
        
         buildPackages,

     

       45
       46
        
         pkgsBuildTarget,

     
···

       90
       91
        
         is10 = majorVersion == "10";

     

       91
       92
        
         is9 = majorVersion == "9";

     

       92
       93
        
       

     

       94
       94
       +
         # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1

     

       95
       95
       +
         # snapshots have a form like MAJOR.MINOR.MICRO.DATE, like 14.2.1.20250322

     

       96
       96
       +
         isSnapshot = lib.length (lib.splitVersion version) == 4;

     

       97
       97
       +
         # return snapshot date of gcc's given version:

     

       98
       98
       +
         #   "14.2.1.20250322" -> "20250322"

     

       99
       99
       +
         #   "14.2.0" -> ""

     

       100
       100
       +
         snapDate = lib.concatStrings (lib.drop 3 (lib.splitVersion version));

     

       101
       101
       +
         # return base version without a snapshot:

     

       102
       102
       +
         #   "14.2.1.20250322" -> "14.2.1"

     

       103
       103
       +
         #   "14.2.0" -> "14.2.0"

     

       104
       104
       +
         baseVersion = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version));

     

       105
       105
       +
       

     

       93
       106
        
         disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);

     

       94
       107
        
       

     

       95
       108
        
         inherit (stdenv) buildPlatform hostPlatform targetPlatform;

     
···

       109
       122
        
           # lets

     

       110
       123
        
           inherit

     

       111
       124
        
             majorVersion

     

       125
       125
       +
             isSnapshot

     

       112
       126
        
             version

     

       113
       127
        
             buildPlatform

     

       114
       128
        
             hostPlatform

     
···

       135
       149
        
             enableShared

     

       136
       150
        
             fetchpatch

     

       137
       151
        
             fetchurl

     

       152
       152
       +
             flex

     

       138
       153
        
             gettext

     

       139
       154
        
             gmp

     

       140
       155
        
             gnat-bootstrap

     
···

       198
       213
        
         ((callFile ./common/builder.nix { }) (

     

       199
       214
        
           {

     

       200
       215
        
             pname = "${crossNameAddon}${name}";

     

       201
       201
       -
             inherit version;

     

       216
       216
       +
             # retain snapshot date in package version, but not in final version

     

       217
       217
       +
             # as the version is frequently used to construct pathnames (at least

     

       218
       218
       +
             # in cc-wrapper).

     

       219
       219
       +
             name = "${crossNameAddon}${name}-${version}";

     

       220
       220
       +
             version = baseVersion;

     

       202
       221
        
       

     

       203
       222
        
             src = fetchurl {

     

       204
       204
       -
               url = "mirror://gcc/${

     

       205
       205
       -
                 # TODO: Remove this before 25.05.

     

       206
       206
       -
                 if version == "14-20241116" then "snapshots/" else "releases/gcc-"

     

       207
       207
       -
               }${version}/gcc-${version}.tar.xz";

     

       223
       223
       +
               url =

     

       224
       224
       +
                 if isSnapshot then

     

       225
       225
       +
                   "mirror://gcc/snapshots/${majorVersion}-${snapDate}/gcc-${majorVersion}-${snapDate}.tar.xz"

     

       226
       226
       +
                 else

     

       227
       227
       +
                   "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";

     

       208
       228
        
               ${if is10 || is11 || is13 then "hash" else "sha256"} = gccVersions.srcHashForVersion version;

     

       209
       229
        
             };

     

       210
       230
        
       

     
···

       232
       252
        
                 for configureScript in $configureScripts; do

     

       233
       253
        
                   patchShebangs $configureScript

     

       234
       254
        
                 done

     

       235
       235
       -
               ''

     

       236
       236
       -
               # Copy the precompiled `gcc/gengtype-lex.cc` from the 14.2.0 tarball.

     

       237
       237
       -
               # Since the `gcc/gengtype-lex.l` file didn’t change between 14.2.0

     

       238
       238
       -
               # and 14-2024116, this is safe. If it changes and we update the

     

       239
       239
       -
               # snapshot, we might need to vendor the compiled output in Nixpkgs.

     

       240
       240
       -
               #

     

       241
       241
       -
               # TODO: Remove this before 25.05.

     

       242
       242
       -
               + optionalString (version == "14-20241116") ''

     

       243
       243
       -
                 cksum -c <<EOF

     

       244
       244
       -
                 SHA256 (gcc/gengtype-lex.l) = 05acceeda02e673eaef47d187d3a68a1632508112fbe31b5dc2b0a898998d7ec

     

       245
       245
       -
                 EOF

     

       246
       255
        
       

     

       247
       247
       -
                 (XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < ${

     

       248
       248
       -
                   fetchurl {

     

       249
       249
       -
                     url = "mirror://gcc/releases/gcc-14.2.0/gcc-14.2.0.tar.xz";

     

       250
       250
       -
                     hash = "sha256-p7Obxpy/niWCbFpgqyZHcAH3wI2FzsBLwOKcq+1vPMk=";

     

       251
       251
       -
                   }

     

       252
       252
       -
                 }; true) | tar xf - \

     

       253
       253
       -
                   --mode=+w \

     

       254
       254
       -
                   --warning=no-timestamp \

     

       255
       255
       -
                   --strip-components=1 \

     

       256
       256
       -
                   gcc-14.2.0/gcc/gengtype-lex.cc

     

       257
       257
       -
       

     

       258
       258
       -
                 # Make sure Make knows it’s up‐to‐date.

     

       259
       259
       -
                 touch gcc/gengtype-lex.cc

     

       256
       256
       +
                 # Make sure nixpkgs versioning match upstream one

     

       257
       257
       +
                 # to ease version-based comparisons.

     

       258
       258
       +
                 gcc_base_version=$(< gcc/BASE-VER)

     

       259
       259
       +
                 if [[ ${baseVersion} != $gcc_base_version ]]; then

     

       260
       260
       +
                   echo "Please update 'version' variable:"

     

       261
       261
       +
                   echo "  Expected: '$gcc_base_version'"

     

       262
       262
       +
                   echo "  Actual: '${version}'"

     

       263
       263
       +
                   exit 1

     

       264
       264
       +
                 fi

     

       260
       265
        
               ''

     

       261
       266
        
               # This should kill all the stdinc frameworks that gcc and friends like to

     

       262
       267
        
               # insert into default search paths.

+4 -2

pkgs/development/compilers/gcc/versions.nix

···

       1
       1
        
       let

     

       2
       2
        
         majorMinorToVersionMap = {

     

       3
       3
       -
           "14" = "14-20241116";

     

       3
       3
       +
           "14" = "14.2.1.20250322";

     

       4
       4
        
           "13" = "13.3.0";

     

       5
       5
        
           "12" = "12.4.0";

     

       6
       6
        
           "11" = "11.5.0";

     
···

       14
       14
        
         srcHashForVersion =

     

       15
       15
        
           version:

     

       16
       16
        
           {

     

       17
       17
       -
             "14-20241116" = "sha256-aXSkle8Mzj/Q15cHOu0D9Os2PWQwMIboUZULhnsRSUo=";

     

       17
       17
       +
             # 3 digits: releases (14.2.0)

     

       18
       18
       +
             # 4 digits: snapshots (14.2.1.20250322)

     

       19
       19
       +
             "14.2.1.20250322" = "sha256-I3ROhiU4jYaB2aci2Z3B/mvLLTjBBoCF1CL7uiHTmUM=";

     

       18
       20
        
             "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM=";

     

       19
       21
        
             "12.4.0" = "sha256-cE9lJgTMvMsUvavzR4yVEciXiLEss7v/3tNzQZFqkXU=";

     

       20
       22
        
             "11.5.0" = "sha256-puIYaOrVRc+H8MAfhCduS1KB1nIJhZHByJYkHwk2NHg=";