commit e8fb7eec13089795f60c6a1b2a6afeb52a755570 · pyrox.dev/nixpkgs

+12

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

···

       184
       184
        
       

     

       185
       185
        
       - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead.

     

       186
       186
        
       

     

       187
       187
       +
       - The `django` alias in the python package set was upgraded to Django 4.x.

     

       188
       188
       +
         Applications that consume Django should always pin their python environment

     

       189
       189
       +
         to a compatible major version, so they can move at their own pace.

     

       190
       190
       +
       

     

       191
       191
       +
         ```nix

     

       192
       192
       +
         python = python3.override {

     

       193
       193
       +
           packageOverrides = self: super: {

     

       194
       194
       +
             django = super.django_3;

     

       195
       195
       +
           };

     

       196
       196
       +
         };

     

       197
       197
       +
         ```

     

       198
       198
       +
       

     

       187
       199
        
       - The `qemu-vm.nix` module by default now identifies block devices via

     

       188
       200
        
         persistent names available in `/dev/disk/by-*`. Because the rootDevice is

     

       189
       201
        
         identfied by its filesystem label, it needs to be formatted before the VM is

+12 -40

pkgs/applications/editors/ed/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, lzip }:

     

       2
       2
       -
       

     

       3
       3
       -
       # Note: this package is used for bootstrapping fetchurl, and thus

     

       4
       4
       -
       # cannot use fetchpatch! All mutable patches (generated by GitHub or

     

       5
       5
       -
       # cgit) that are needed here should be included directly in Nixpkgs as

     

       6
       6
       -
       # files.

     

       7
       7
       -
       

     

       8
       8
       -
       stdenv.mkDerivation rec {

     

       9
       9
       -
         pname = "ed";

     

       10
       10
       -
         version = "1.19";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchurl {

     

       13
       13
       -
           url = "mirror://gnu/ed/${pname}-${version}.tar.lz";

     

       14
       14
       -
           hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg=";

     

       15
       15
       -
         };

     

       1
       1
       +
       { lib, pkgs }:

     

       16
       2
        
       

     

       17
       17
       -
         nativeBuildInputs = [ lzip ];

     

       18
       18
       -
       

     

       19
       19
       -
         configureFlags = [

     

       20
       20
       -
           "CC=${stdenv.cc.targetPrefix}cc"

     

       21
       21
       -
         ];

     

       22
       22
       -
       

     

       23
       23
       -
         doCheck = true;

     

       3
       3
       +
       lib.makeScope pkgs.newScope (self:

     

       4
       4
       +
         let

     

       5
       5
       +
           inherit (self) callPackage;

     

       6
       6
       +
         in {

     

       7
       7
       +
           sources = import ./sources.nix {

     

       8
       8
       +
             inherit lib;

     

       9
       9
       +
             inherit (pkgs) fetchurl;

     

       10
       10
       +
           };

     

       24
       11
        
       

     

       25
       25
       -
         meta = {

     

       26
       26
       -
           description = "An implementation of the standard Unix editor";

     

       27
       27
       -
           longDescription = ''

     

       28
       28
       -
             GNU ed is a line-oriented text editor.  It is used to create,

     

       29
       29
       -
             display, modify and otherwise manipulate text files, both

     

       30
       30
       -
             interactively and via shell scripts.  A restricted version of ed,

     

       31
       31
       -
             red, can only edit files in the current directory and cannot

     

       32
       32
       -
             execute shell commands.  Ed is the "standard" text editor in the

     

       33
       33
       -
             sense that it is the original editor for Unix, and thus widely

     

       34
       34
       -
             available.  For most purposes, however, it is superseded by

     

       35
       35
       -
             full-screen editors such as GNU Emacs or GNU Moe.

     

       36
       36
       -
           '';

     

       37
       37
       -
           license = lib.licenses.gpl3Plus;

     

       38
       38
       -
           homepage = "https://www.gnu.org/software/ed/";

     

       39
       39
       -
           maintainers = [ ];

     

       40
       40
       -
           platforms = lib.platforms.unix;

     

       41
       41
       -
         };

     

       42
       42
       -
       }

     

       12
       12
       +
           ed = callPackage (self.sources.ed) { };

     

       13
       13
       +
           edUnstable = callPackage (self.sources.edUnstable) { };

     

       14
       14
       +
         })

+30

pkgs/applications/editors/ed/generic.nix

···

       1
       1
       +
       { pname

     

       2
       2
       +
       , version

     

       3
       3
       +
       , src

     

       4
       4
       +
       , patches ? [ ]

     

       5
       5
       +
       , meta

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       # Note: this package is used for bootstrapping fetchurl, and thus cannot use

     

       9
       9
       +
       # fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed

     

       10
       10
       +
       # here should be included directly in Nixpkgs as files.

     

       11
       11
       +
       

     

       12
       12
       +
       { lib

     

       13
       13
       +
       , stdenv

     

       14
       14
       +
       , fetchurl

     

       15
       15
       +
       , lzip

     

       16
       16
       +
       }:

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation {

     

       19
       19
       +
         inherit pname version src patches;

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [ lzip ];

     

       22
       22
       +
       

     

       23
       23
       +
         configureFlags = [

     

       24
       24
       +
           "CC=${stdenv.cc.targetPrefix}cc"

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         doCheck = true;

     

       28
       28
       +
       

     

       29
       29
       +
         inherit meta;

     

       30
       30
       +
       }

+45

pkgs/applications/editors/ed/sources.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , fetchurl

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         meta = {

     

       7
       7
       +
           description = "The GNU implementation of the standard Unix editor";

     

       8
       8
       +
           longDescription = ''

     

       9
       9
       +
             GNU ed is a line-oriented text editor. It is used to create, display,

     

       10
       10
       +
             modify and otherwise manipulate text files, both interactively and via

     

       11
       11
       +
             shell scripts. A restricted version of ed, red, can only edit files in the

     

       12
       12
       +
             current directory and cannot execute shell commands. Ed is the 'standard'

     

       13
       13
       +
             text editor in the sense that it is the original editor for Unix, and thus

     

       14
       14
       +
             widely available. For most purposes, however, it is superseded by

     

       15
       15
       +
             full-screen editors such as GNU Emacs or GNU Moe.

     

       16
       16
       +
           '';

     

       17
       17
       +
           license = lib.licenses.gpl3Plus;

     

       18
       18
       +
           homepage = "https://www.gnu.org/software/ed/";

     

       19
       19
       +
           maintainers = with lib.maintainers; [ AndersonTorres ];

     

       20
       20
       +
           platforms = lib.platforms.unix;

     

       21
       21
       +
         };

     

       22
       22
       +
       in

     

       23
       23
       +
       {

     

       24
       24
       +
         ed = let

     

       25
       25
       +
           pname = "ed";

     

       26
       26
       +
           version = "1.19";

     

       27
       27
       +
           src = fetchurl {

     

       28
       28
       +
             url = "mirror://gnu/ed/ed-${version}.tar.lz";

     

       29
       29
       +
             hash = "sha256-zi8uXEJHkKqW0J2suT2bv9wLfrYknJy3U4RS6Ox3zUg=";

     

       30
       30
       +
           };

     

       31
       31
       +
         in import ./generic.nix {

     

       32
       32
       +
           inherit pname version src meta;

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         edUnstable = let

     

       36
       36
       +
           pname = "ed";

     

       37
       37
       +
           version = "1.20-pre2";

     

       38
       38
       +
           src = fetchurl {

     

       39
       39
       +
             url = "http://download.savannah.gnu.org/releases/ed/ed-${version}.tar.lz";

     

       40
       40
       +
             hash = "sha256-bHTDeMhVNNo3qqDNoBNaBA+DHDa4WJpfQNcTvAUPgsY=";

     

       41
       41
       +
           };

     

       42
       42
       +
         in import ./generic.nix {

     

       43
       43
       +
           inherit pname version src meta;

     

       44
       44
       +
         };

     

       45
       45
       +
       }

+21

pkgs/applications/misc/djvulibre/c++17-register-class.patch

···

       1
       1
       +
       diff -ur a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h

     

       2
       2
       +
       --- a/libdjvu/GBitmap.h	2020-11-20 09:57:32.000000000 -0700

     

       3
       3
       +
       +++ b/libdjvu/GBitmap.h	2023-07-07 07:07:45.519912414 -0600

     

       4
       4
       +
       @@ -620,7 +620,7 @@

     

       5
       5
       +
        inline int

     

       6
       6
       +
        GBitmap::read_run(unsigned char *&data)

     

       7
       7
       +
        {

     

       8
       8
       +
       -  register int z=*data++;

     

       9
       9
       +
       +  int z=*data++;

     

       10
       10
       +
          return (z>=RUNOVERFLOWVALUE)?

     

       11
       11
       +
            ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;

     

       12
       12
       +
        }

     

       13
       13
       +
       @@ -628,7 +628,7 @@

     

       14
       14
       +
        inline int

     

       15
       15
       +
        GBitmap::read_run(const unsigned char *&data)

     

       16
       16
       +
        {

     

       17
       17
       +
       -  register int z=*data++;

     

       18
       18
       +
       +  int z=*data++;

     

       19
       19
       +
          return (z>=RUNOVERFLOWVALUE)?

     

       20
       20
       +
            ((z&~RUNOVERFLOWVALUE)<<8)|(*data++):z;

     

       21
       21
       +
        }

+4

pkgs/applications/misc/djvulibre/default.nix

···

       30
       30
        
           bash

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       +
         # Remove uses of the `register` storage class specifier, which was removed in C++17.

     

       34
       34
       +
         # Fixes compilation with clang 16, which defaults to C++17.

     

       35
       35
       +
         patches = [ ./c++17-register-class.patch ];

     

       36
       36
       +
       

     

       33
       37
        
         enableParallelBuilding = true;

     

       34
       38
        
       

     

       35
       39
        
         meta = with lib; {

+2

pkgs/applications/misc/privacyidea/default.nix

···

       9
       9
        
       

     

       10
       10
        
         python3' = python310.override {

     

       11
       11
        
           packageOverrides = self: super: {

     

       12
       12
       +
             django = super.django_3;

     

       13
       13
       +
       

     

       12
       14
        
             sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {

     

       13
       15
        
               version = "1.3.24";

     

       14
       16
        
               src = fetchPypi {

+3 -3

pkgs/applications/version-management/mercurial/default.nix

···

       21
       21
        
       

     

       22
       22
        
         self = python3Packages.buildPythonApplication rec {

     

       23
       23
        
           pname = "mercurial${lib.optionalString fullBuild "-full"}";

     

       24
       24
       -
           version = "6.5";

     

       24
       24
       +
           version = "6.5.1";

     

       25
       25
        
       

     

       26
       26
        
           src = fetchurl {

     

       27
       27
        
             url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";

     

       28
       28
       -
             sha256 = "sha256-pWA9DTlev2f+XSeruzvTf8wBhx7POUx5NnLSweaL5+c=";

     

       28
       28
       +
             sha256 = "sha256-M/fejYs2B/orQIzeS4cl4RfrCtQZJqeH6qtAnKik/C8=";

     

       29
       29
        
           };

     

       30
       30
        
       

     

       31
       31
        
           format = "other";

     
···

       35
       35
        
           cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {

     

       36
       36
        
             inherit src;

     

       37
       37
        
             name = "mercurial-${version}";

     

       38
       38
       -
             sha256 = "sha256-umjOU3OmTdPmLS4IWncqmKxSa6J4KXwTlGhylFt6TQo=";

     

       38
       38
       +
             sha256 = "sha256-tPv0UeZOsHDGKzXWeA/fFio7d3EN+KGioDu/1WH1drc=";

     

       39
       39
        
             sourceRoot = "mercurial-${version}/rust";

     

       40
       40
        
           } else null;

     

       41
       41
        
           cargoRoot = if rustSupport then "rust" else null;

+5 -2

pkgs/build-support/cc-wrapper/cc-wrapper.sh

···

       246
       246
        
       fi

     

       247
       247
        
       

     

       248
       248
        
       if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then

     

       249
       249
       -
           exec @prog@ @<(printf "%q\n" \

     

       249
       249
       +
           responseFile=$(mktemp --tmpdir cc-params.XXXXXX)

     

       250
       250
       +
           trap 'rm -f -- "$responseFile"' EXIT

     

       251
       251
       +
           printf "%q\n" \

     

       250
       252
        
              ${extraBefore+"${extraBefore[@]}"} \

     

       251
       253
        
              ${params+"${params[@]}"} \

     

       252
       252
       -
              ${extraAfter+"${extraAfter[@]}"})

     

       254
       254
       +
              ${extraAfter+"${extraAfter[@]}"} > "$responseFile"

     

       255
       255
       +
           @prog@ "@$responseFile"

     

       253
       256
        
       else

     

       254
       257
        
           exec @prog@ \

     

       255
       258
        
              ${extraBefore+"${extraBefore[@]}"} \

+18

pkgs/build-support/cc-wrapper/default.nix

···

       51
       51
        
       

     

       52
       52
        
       # the derivation at which the `-B` and `-L` flags added by `useCcForLibs` will point

     

       53
       53
        
       , gccForLibs ? if useCcForLibs then cc else null

     

       54
       54
       +
       , fortify-headers ? null

     

       55
       55
       +
       , includeFortifyHeaders ? null

     

       54
       56
        
       }:

     

       55
       57
        
       

     

       56
       58
        
       with lib;

     
···

       64
       66
        
       let

     

       65
       67
        
         stdenv = stdenvNoCC;

     

       66
       68
        
         inherit (stdenv) hostPlatform targetPlatform;

     

       69
       69
       +
       

     

       70
       70
       +
         includeFortifyHeaders' = if includeFortifyHeaders != null

     

       71
       71
       +
           then includeFortifyHeaders

     

       72
       72
       +
           else targetPlatform.libc == "musl";

     

       67
       73
        
       

     

       68
       74
        
         # Prefix for binaries. Customarily ends with a dash separator.

     

       69
       75
        
         #

     
···

       164
       170
        
         darwinMinVersionVariable = optionalString stdenv.targetPlatform.isDarwin

     

       165
       171
        
           stdenv.targetPlatform.darwinMinVersionVariable;

     

       166
       172
        
       in

     

       173
       173
       +
       

     

       174
       174
       +
       assert includeFortifyHeaders' -> fortify-headers != null;

     

       167
       175
        
       

     

       168
       176
        
       # Ensure bintools matches

     

       169
       177
        
       assert libc_bin == bintools.libc_bin;

     
···

       414
       422
        
       

     

       415
       423
        
             echo "${libc_lib}" > $out/nix-support/orig-libc

     

       416
       424
        
             echo "${libc_dev}" > $out/nix-support/orig-libc-dev

     

       425
       425
       +
           ''

     

       426
       426
       +
           # fortify-headers is a set of wrapper headers that augment libc

     

       427
       427
       +
           # and use #include_next to pass through to libc's true

     

       428
       428
       +
           # implementations, so must appear before them in search order.

     

       429
       429
       +
           # in theory a correctly placed -idirafter could be used, but in

     

       430
       430
       +
           # practice the compiler may have been built with a --with-headers

     

       431
       431
       +
           # like option that forces the libc headers before all -idirafter,

     

       432
       432
       +
           # hence -isystem here.

     

       433
       433
       +
           + optionalString includeFortifyHeaders' ''

     

       434
       434
       +
             echo "-isystem ${fortify-headers}/include" >> $out/nix-support/libc-cflags

     

       417
       435
        
           '')

     

       418
       436
        
       

     

       419
       437
        
           ##

+8 -4

pkgs/build-support/go/module.nix

···

       52
       52
        
       let

     

       53
       53
        
         args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ];

     

       54
       54
        
       

     

       55
       55
       +
         GO111MODULE = "on";

     

       56
       56
       +
         GOTOOLCHAIN = "local";

     

       57
       57
       +
       

     

       55
       58
        
         goModules = if (vendorHash == null) then "" else

     

       56
       59
        
         (stdenv.mkDerivation {

     

       57
       60
        
           name = "${name}-go-modules";

     
···

       60
       63
        
       

     

       61
       64
        
           inherit (args) src;

     

       62
       65
        
           inherit (go) GOOS GOARCH;

     

       66
       66
       +
           inherit GO111MODULE GOTOOLCHAIN;

     

       63
       67
        
       

     

       64
       68
        
           # The following inheritence behavior is not trivial to expect, and some may

     

       65
       69
        
           # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and

     
···

       73
       77
        
           postBuild = args.modPostBuild or "";

     

       74
       78
        
           sourceRoot = args.sourceRoot or "";

     

       75
       79
        
       

     

       76
       76
       -
           GO111MODULE = "on";

     

       77
       77
       -
       

     

       78
       80
        
           impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [

     

       79
       81
        
             "GIT_PROXY_COMMAND"

     

       80
       82
        
             "SOCKS_SERVER"

     
···

       85
       87
        
             runHook preConfigure

     

       86
       88
        
             export GOCACHE=$TMPDIR/go-cache

     

       87
       89
        
             export GOPATH="$TMPDIR/go"

     

       90
       90
       +
             # fixes 'GOPROXY list is not the empty string, but contains no entries'

     

       91
       91
       +
             # "https://proxy.golang.org,direct" is the go default

     

       92
       92
       +
             export GOPROXY="''${GOPROXY:-"https://proxy.golang.org,direct"}" # respect impureEnvVars

     

       88
       93
        
             cd "${modRoot}"

     

       89
       94
        
             runHook postConfigure

     

       90
       95
        
           '';

     
···

       149
       154
        
       

     

       150
       155
        
           inherit (go) GOOS GOARCH;

     

       151
       156
        
       

     

       152
       152
       -
           GO111MODULE = "on";

     

       153
       157
        
           GOFLAGS = lib.optionals (!proxyVendor) [ "-mod=vendor" ] ++ lib.optionals (!allowGoReference) [ "-trimpath" ];

     

       154
       154
       -
           inherit CGO_ENABLED enableParallelBuilding;

     

       158
       158
       +
           inherit CGO_ENABLED enableParallelBuilding GO111MODULE GOTOOLCHAIN;

     

       155
       159
        
       

     

       156
       160
        
           configurePhase = args.configurePhase or (''

     

       157
       161
        
             runHook preConfigure

+1

pkgs/build-support/go/package.nix

···

       86
       86
        
           inherit CGO_ENABLED enableParallelBuilding;

     

       87
       87
        
       

     

       88
       88
        
           GO111MODULE = "off";

     

       89
       89
       +
           GOTOOLCHAIN = "local";

     

       89
       90
        
           GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ];

     

       90
       91
        
       

     

       91
       92
        
           GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);

+2 -5

pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix

···

       1
       1
       -
       { stdenv

     

       2
       2
       -
       , targetPackages

     

       1
       1
       +
       { targetPackages

     

       3
       2
        
       , lib

     

       4
       3
        
       , makeSetupHook

     

       5
       4
        
       , dieHook

     
···

       11
       10
        
       

     

       12
       11
        
       makeSetupHook {

     

       13
       12
        
         name = "make-binary-wrapper-hook";

     

       14
       14
       -
         propagatedBuildInputs = [ dieHook ]

     

       15
       15
       -
           # https://github.com/NixOS/nixpkgs/issues/148189

     

       16
       16
       -
           ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc;

     

       13
       13
       +
         propagatedBuildInputs = [ dieHook ];

     

       17
       14
        
       

     

       18
       15
        
         substitutions = {

     

       19
       16
        
           cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";

+31 -9

pkgs/build-support/setup-hooks/patch-shebangs.sh

···

       11
       11
        
       

     

       12
       12
        
       # Run patch shebangs on a directory or file.

     

       13
       13
        
       # Can take multiple paths as arguments.

     

       14
       14
       -
       # patchShebangs [--build | --host] PATH...

     

       14
       14
       +
       # patchShebangs [--build | --host | --update] [--] PATH...

     

       15
       15
        
       

     

       16
       16
        
       # Flags:

     

       17
       17
        
       # --build : Lookup commands available at build-time

     

       18
       18
        
       # --host  : Lookup commands available at runtime

     

       19
       19
       +
       # --update : Update shebang paths that are in Nix store

     

       19
       20
        
       

     

       20
       21
        
       # Example use cases,

     

       21
       22
        
       # $ patchShebangs --host /nix/store/...-hello-1.0/bin

     
···

       23
       24
        
       

     

       24
       25
        
       patchShebangs() {

     

       25
       26
        
           local pathName

     

       27
       27
       +
           local update

     

       26
       28
        
       

     

       27
       27
       -
           if [[ "$1" == "--host" ]]; then

     

       28
       28
       -
               pathName=HOST_PATH

     

       29
       29
       -
               shift

     

       30
       30
       -
           elif [[ "$1" == "--build" ]]; then

     

       31
       31
       -
               pathName=PATH

     

       32
       32
       -
               shift

     

       33
       33
       -
           fi

     

       29
       29
       +
           while [[ $# -gt 0 ]]; do

     

       30
       30
       +
               case "$1" in

     

       31
       31
       +
               --host)

     

       32
       32
       +
                   pathName=HOST_PATH

     

       33
       33
       +
                   shift

     

       34
       34
       +
                   ;;

     

       35
       35
       +
               --build)

     

       36
       36
       +
                   pathName=PATH

     

       37
       37
       +
                   shift

     

       38
       38
       +
                   ;;

     

       39
       39
       +
               --update)

     

       40
       40
       +
                   update=true

     

       41
       41
       +
                   shift

     

       42
       42
       +
                   ;;

     

       43
       43
       +
               --)

     

       44
       44
       +
                   shift

     

       45
       45
       +
                   break

     

       46
       46
       +
                   ;;

     

       47
       47
       +
               -*|--*)

     

       48
       48
       +
                   echo "Unknown option $1 supplied to patchShebangs" >&2

     

       49
       49
       +
                   return 1

     

       50
       50
       +
                   ;;

     

       51
       51
       +
               *)

     

       52
       52
       +
                   break

     

       53
       53
       +
                   ;;

     

       54
       54
       +
               esac

     

       55
       55
       +
           done

     

       34
       56
        
       

     

       35
       57
        
           echo "patching script interpreter paths in $@"

     

       36
       58
        
           local f

     
···

       93
       115
        
               newInterpreterLine="$newPath $args"

     

       94
       116
        
               newInterpreterLine=${newInterpreterLine%${newInterpreterLine##*[![:space:]]}}

     

       95
       117
        
       

     

       96
       96
       -
               if [[ -n "$oldPath" && "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]]; then

     

       118
       118
       +
               if [[ -n "$oldPath" && ( "$update" == true || "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ) ]]; then

     

       97
       119
        
                   if [[ -n "$newPath" && "$newPath" != "$oldPath" ]]; then

     

       98
       120
        
                       echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""

     

       99
       121
        
                       # escape the escape chars so that sed doesn't interpret them

-90

pkgs/build-support/setup-hooks/strip-tmp-aarch64.sh

···

       1
       1
       -
       # This setup hook strips libraries and executables in the fixup phase.

     

       2
       2
       -
       

     

       3
       3
       -
       fixupOutputHooks+=(_doStrip)

     

       4
       4
       -
       

     

       5
       5
       -
       _doStrip() {

     

       6
       6
       -
           # We don't bother to strip build platform code because it shouldn't make it

     

       7
       7
       -
           # to $out anyways---if it does, that's a bigger problem that a lack of

     

       8
       8
       -
           # stripping will help catch.

     

       9
       9
       -
           local -ra flags=(dontStripHost dontStripTarget)

     

       10
       10
       -
           local -ra debugDirs=(stripDebugList stripDebugListTarget)

     

       11
       11
       -
           local -ra allDirs=(stripAllList stripAllListTarget)

     

       12
       12
       -
           local -ra stripCmds=(STRIP STRIP_FOR_TARGET)

     

       13
       13
       -
           local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET)

     

       14
       14
       -
       

     

       15
       15
       -
           # TODO(structured-attrs): This doesn't work correctly if one of

     

       16
       16
       -
           #   the items in strip*List or strip*Flags contains a space,

     

       17
       17
       -
           #   even with structured attrs enabled.  This is OK for now

     

       18
       18
       -
           #   because very few packages set any of these, and it doesn't

     

       19
       19
       -
           #   affect any of them.

     

       20
       20
       -
           #

     

       21
       21
       -
           #   After __structuredAttrs = true is universal, come back and

     

       22
       22
       -
           #   push arrays all the way through this logic.

     

       23
       23
       -
       

     

       24
       24
       -
           # Strip only host paths by default. Leave targets as is.

     

       25
       25
       -
           stripDebugList=${stripDebugList[*]:-lib lib32 lib64 libexec bin sbin}

     

       26
       26
       -
           stripDebugListTarget=${stripDebugListTarget[*]:-}

     

       27
       27
       -
           stripAllList=${stripAllList[*]:-}

     

       28
       28
       -
           stripAllListTarget=${stripAllListTarget[*]:-}

     

       29
       29
       -
       

     

       30
       30
       -
           local i

     

       31
       31
       -
           for i in ${!stripCmds[@]}; do

     

       32
       32
       -
               local -n flag="${flags[$i]}"

     

       33
       33
       -
               local -n debugDirList="${debugDirs[$i]}"

     

       34
       34
       -
               local -n allDirList="${allDirs[$i]}"

     

       35
       35
       -
               local -n stripCmd="${stripCmds[$i]}"

     

       36
       36
       -
               local -n ranlibCmd="${ranlibCmds[$i]}"

     

       37
       37
       -
       

     

       38
       38
       -
               # `dontStrip` disables them all

     

       39
       39
       -
               if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2

     

       40
       40
       -
               then continue; fi

     

       41
       41
       -
       

     

       42
       42
       -
               stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S -p}"

     

       43
       43
       -
               stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags[*]:--s -p}"

     

       44
       44
       -
           done

     

       45
       45
       -
       }

     

       46
       46
       -
       

     

       47
       47
       -
       stripDirs() {

     

       48
       48
       -
           local cmd="$1"

     

       49
       49
       -
           local ranlibCmd="$2"

     

       50
       50
       -
           local paths="$3"

     

       51
       51
       -
           local stripFlags="$4"

     

       52
       52
       -
           local pathsNew=

     

       53
       53
       -
       

     

       54
       54
       -
           [ -z "$cmd" ] && echo "stripDirs: Strip command is empty" 1>&2 && exit 1

     

       55
       55
       -
           [ -z "$ranlibCmd" ] && echo "stripDirs: Ranlib command is empty" 1>&2 && exit 1

     

       56
       56
       -
       

     

       57
       57
       -
           local p

     

       58
       58
       -
           for p in ${paths}; do

     

       59
       59
       -
               if [ -e "$prefix/$p" ]; then

     

       60
       60
       -
                   pathsNew="${pathsNew} $prefix/$p"

     

       61
       61
       -
               fi

     

       62
       62
       -
           done

     

       63
       63
       -
           paths=${pathsNew}

     

       64
       64
       -
       

     

       65
       65
       -
           if [ -n "${paths}" ]; then

     

       66
       66
       -
               echo "stripping (with command $cmd and flags $stripFlags) in $paths"

     

       67
       67
       -
               local striperr

     

       68
       68
       -
               striperr="$(mktemp 'striperr.XXXXXX')"

     

       69
       69
       -
               # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh.

     

       70
       70
       -
               find $paths -type f -a '!' -path "$prefix/lib/debug/*" -print0 |

     

       71
       71
       -
                   # Make sure we process files under symlinks only once. Otherwise

     

       72
       72
       -
                   # 'strip` can corrupt files when writes to them in parallel:

     

       73
       73
       -
                   #   https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039

     

       74
       74
       -
                   xargs -r -0 -n1 -- realpath -z | sort -u -z |

     

       75
       75
       -
       

     

       76
       76
       -
                   xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$?

     

       77
       77
       -
               # xargs exits with status code 123 if some but not all of the

     

       78
       78
       -
               # processes fail. We don't care if some of the files couldn't

     

       79
       79
       -
               # be stripped, so ignore specifically this code.

     

       80
       80
       -
               [[ "$exit_code" = 123 || -z "$exit_code" ]] || (cat "$striperr" 1>&2 && exit 1)

     

       81
       81
       -
       

     

       82
       82
       -
               rm "$striperr"

     

       83
       83
       -
               # 'strip' does not normally preserve archive index in .a files.

     

       84
       84
       -
               # This usually causes linking failures against static libs like:

     

       85
       85
       -
               #   ld: ...-i686-w64-mingw32-stage-final-gcc-13.0.0-lib/i686-w64-mingw32/lib/libstdc++.dll.a:

     

       86
       86
       -
               #     error adding symbols: archive has no index; run ranlib to add one

     

       87
       87
       -
               # Restore the index by running 'ranlib'.

     

       88
       88
       -
               find $paths -name '*.a' -type f -exec $ranlibCmd '{}' \; 2>/dev/null

     

       89
       89
       -
           fi

     

       90
       90
       -
       }

+6 -1

pkgs/build-support/setup-hooks/strip.sh

···

       65
       65
        
           if [ -n "${paths}" ]; then

     

       66
       66
        
               echo "stripping (with command $cmd and flags $stripFlags) in $paths"

     

       67
       67
        
               local striperr

     

       68
       68
       -
               striperr="$(mktemp 'striperr.XXXXXX')"

     

       68
       68
       +
               striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')"

     

       69
       69
        
               # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh.

     

       70
       70
        
               find $paths -type f -a '!' -path "$prefix/lib/debug/*" -print0 |

     

       71
       71
       +
                   # Make sure we process files under symlinks only once. Otherwise

     

       72
       72
       +
                   # 'strip` can corrupt files when writes to them in parallel:

     

       73
       73
       +
                   #   https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039

     

       74
       74
       +
                   xargs -r -0 -n1 -- realpath -z | sort -u -z |

     

       75
       75
       +
       

     

       71
       76
        
                   xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$?

     

       72
       77
        
               # xargs exits with status code 123 if some but not all of the

     

       73
       78
        
               # processes fail. We don't care if some of the files couldn't

+1 -6

pkgs/build-support/writers/scripts.nix

···

       92
       92
        
             passAsFile = [ "content" ];

     

       93
       93
        
           } else {

     

       94
       94
        
             contentPath = content;

     

       95
       95
       -
           }) // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) {

     

       96
       96
       -
             # post-link-hook expects codesign_allocate to be in PATH

     

       97
       97
       -
             # https://github.com/NixOS/nixpkgs/issues/154203

     

       98
       98
       -
             # https://github.com/NixOS/nixpkgs/issues/148189

     

       99
       99
       -
             nativeBuildInputs = [ stdenv.cc.bintools ];

     

       100
       100
       -
           } // lib.optionalAttrs (nameOrPath == "/bin/${name}") {

     

       95
       95
       +
           }) // lib.optionalAttrs (nameOrPath == "/bin/${name}") {

     

       101
       96
        
             meta.mainProgram = name;

     

       102
       97
        
           }) ''

     

       103
       98
        
             ${compileScript}

+2 -1

pkgs/development/compilers/go/1.18.nix

···

       166
       166
        
           runHook preInstall

     

       167
       167
        
           mkdir -p $GOROOT_FINAL

     

       168
       168
        
           cp -a bin pkg src lib misc api doc $GOROOT_FINAL

     

       169
       169
       -
           ln -s $GOROOT_FINAL/bin $out/bin

     

       169
       169
       +
           mkdir -p $out/bin

     

       170
       170
       +
           ln -s $GOROOT_FINAL/bin/* $out/bin

     

       170
       171
        
           runHook postInstall

     

       171
       172
        
         '';

     

       172
       173

+2 -1

pkgs/development/compilers/go/1.19.nix

···

       166
       166
        
           runHook preInstall

     

       167
       167
        
           mkdir -p $GOROOT_FINAL

     

       168
       168
        
           cp -a bin pkg src lib misc api doc $GOROOT_FINAL

     

       169
       169
       -
           ln -s $GOROOT_FINAL/bin $out/bin

     

       169
       169
       +
           mkdir -p $out/bin

     

       170
       170
       +
           ln -s $GOROOT_FINAL/bin/* $out/bin

     

       170
       171
        
           runHook postInstall

     

       171
       172
        
         '';

     

       172
       173

+4 -3

pkgs/development/compilers/go/1.20.nix

···

       46
       46
        
       in

     

       47
       47
        
       stdenv.mkDerivation rec {

     

       48
       48
        
         pname = "go";

     

       49
       49
       -
         version = "1.20.6";

     

       49
       49
       +
         version = "1.20.7";

     

       50
       50
        
       

     

       51
       51
        
         src = fetchurl {

     

       52
       52
        
           url = "https://go.dev/dl/go${version}.src.tar.gz";

     

       53
       53
       -
           hash = "sha256-Yu5bxvtVuLro9wXgy434bWRTYmtOz5MnnihnCS4Lf3A=";

     

       53
       53
       +
           hash = "sha256-LF7pyeweczsNu8K9/tP2IwblHYFyvzj09OVCsnUg9Zc=";

     

       54
       54
        
         };

     

       55
       55
        
       

     

       56
       56
        
         strictDeps = true;

     
···

       158
       158
        
           runHook preInstall

     

       159
       159
        
           mkdir -p $GOROOT_FINAL

     

       160
       160
        
           cp -a bin pkg src lib misc api doc $GOROOT_FINAL

     

       161
       161
       -
           ln -s $GOROOT_FINAL/bin $out/bin

     

       161
       161
       +
           mkdir -p $out/bin

     

       162
       162
       +
           ln -s $GOROOT_FINAL/bin/* $out/bin

     

       162
       163
        
           runHook postInstall

     

       163
       164
        
         '';

     

       164
       165

+183

pkgs/development/compilers/go/1.21.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , tzdata

     

       5
       5
       +
       , substituteAll

     

       6
       6
       +
       , iana-etc

     

       7
       7
       +
       , Security

     

       8
       8
       +
       , Foundation

     

       9
       9
       +
       , xcbuild

     

       10
       10
       +
       , mailcap

     

       11
       11
       +
       , buildPackages

     

       12
       12
       +
       , pkgsBuildTarget

     

       13
       13
       +
       , threadsCross

     

       14
       14
       +
       , testers

     

       15
       15
       +
       , skopeo

     

       16
       16
       +
       , buildGo121Module

     

       17
       17
       +
       }:

     

       18
       18
       +
       

     

       19
       19
       +
       let

     

       20
       20
       +
         useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;

     

       21
       21
       +
         goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { };

     

       22
       22
       +
       

     

       23
       23
       +
         skopeoTest = skopeo.override { buildGoModule = buildGo121Module; };

     

       24
       24
       +
       

     

       25
       25
       +
         goarch = platform: {

     

       26
       26
       +
           "aarch64" = "arm64";

     

       27
       27
       +
           "arm" = "arm";

     

       28
       28
       +
           "armv5tel" = "arm";

     

       29
       29
       +
           "armv6l" = "arm";

     

       30
       30
       +
           "armv7l" = "arm";

     

       31
       31
       +
           "i686" = "386";

     

       32
       32
       +
           "mips" = "mips";

     

       33
       33
       +
           "mips64el" = "mips64le";

     

       34
       34
       +
           "mipsel" = "mipsle";

     

       35
       35
       +
           "powerpc64le" = "ppc64le";

     

       36
       36
       +
           "riscv64" = "riscv64";

     

       37
       37
       +
           "s390x" = "s390x";

     

       38
       38
       +
           "x86_64" = "amd64";

     

       39
       39
       +
         }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");

     

       40
       40
       +
       

     

       41
       41
       +
         # We need a target compiler which is still runnable at build time,

     

       42
       42
       +
         # to handle the cross-building case where build != host == target

     

       43
       43
       +
         targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;

     

       44
       44
       +
       

     

       45
       45
       +
         isCross = stdenv.buildPlatform != stdenv.targetPlatform;

     

       46
       46
       +
       in

     

       47
       47
       +
       stdenv.mkDerivation rec {

     

       48
       48
       +
         pname = "go";

     

       49
       49
       +
         version = "1.21rc4";

     

       50
       50
       +
       

     

       51
       51
       +
         src = fetchurl {

     

       52
       52
       +
           url = "https://go.dev/dl/go${version}.src.tar.gz";

     

       53
       53
       +
           hash = "sha256-IyTyDxERKuw+XV5CjQRoYaNOT5neCrgqjZFNJrj7Af0=";

     

       54
       54
       +
         };

     

       55
       55
       +
       

     

       56
       56
       +
         strictDeps = true;

     

       57
       57
       +
         buildInputs = [ ]

     

       58
       58
       +
           ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]

     

       59
       59
       +
           ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];

     

       60
       60
       +
       

     

       61
       61
       +
         depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];

     

       62
       62
       +
       

     

       63
       63
       +
         depsBuildTarget = lib.optional isCross targetCC;

     

       64
       64
       +
       

     

       65
       65
       +
         depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;

     

       66
       66
       +
       

     

       67
       67
       +
         postPatch = ''

     

       68
       68
       +
           patchShebangs .

     

       69
       69
       +
         '';

     

       70
       70
       +
       

     

       71
       71
       +
         patches = [

     

       72
       72
       +
           (substituteAll {

     

       73
       73
       +
             src = ./iana-etc-1.17.patch;

     

       74
       74
       +
             iana = iana-etc;

     

       75
       75
       +
           })

     

       76
       76
       +
           # Patch the mimetype database location which is missing on NixOS.

     

       77
       77
       +
           # but also allow static binaries built with NixOS to run outside nix

     

       78
       78
       +
           (substituteAll {

     

       79
       79
       +
             src = ./mailcap-1.17.patch;

     

       80
       80
       +
             inherit mailcap;

     

       81
       81
       +
           })

     

       82
       82
       +
           # prepend the nix path to the zoneinfo files but also leave the original value for static binaries

     

       83
       83
       +
           # that run outside a nix server

     

       84
       84
       +
           (substituteAll {

     

       85
       85
       +
             src = ./tzdata-1.19.patch;

     

       86
       86
       +
             inherit tzdata;

     

       87
       87
       +
           })

     

       88
       88
       +
           ./remove-tools-1.11.patch

     

       89
       89
       +
           ./go_no_vendor_checks-1.21.patch

     

       90
       90
       +
         ];

     

       91
       91
       +
       

     

       92
       92
       +
         GOOS = stdenv.targetPlatform.parsed.kernel.name;

     

       93
       93
       +
         GOARCH = goarch stdenv.targetPlatform;

     

       94
       94
       +
         # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.

     

       95
       95
       +
         # Go will nevertheless build a for host system that we will copy over in

     

       96
       96
       +
         # the install phase.

     

       97
       97
       +
         GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;

     

       98
       98
       +
         GOHOSTARCH = goarch stdenv.buildPlatform;

     

       99
       99
       +
       

     

       100
       100
       +
         # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those

     

       101
       101
       +
         # to be different from CC/CXX

     

       102
       102
       +
         CC_FOR_TARGET =

     

       103
       103
       +
           if isCross then

     

       104
       104
       +
             "${targetCC}/bin/${targetCC.targetPrefix}cc"

     

       105
       105
       +
           else

     

       106
       106
       +
             null;

     

       107
       107
       +
         CXX_FOR_TARGET =

     

       108
       108
       +
           if isCross then

     

       109
       109
       +
             "${targetCC}/bin/${targetCC.targetPrefix}c++"

     

       110
       110
       +
           else

     

       111
       111
       +
             null;

     

       112
       112
       +
       

     

       113
       113
       +
         GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);

     

       114
       114
       +
         GO386 = "softfloat"; # from Arch: don't assume sse2 on i686

     

       115
       115
       +
         CGO_ENABLED = 1;

     

       116
       116
       +
       

     

       117
       117
       +
         GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";

     

       118
       118
       +
       

     

       119
       119
       +
         buildPhase = ''

     

       120
       120
       +
           runHook preBuild

     

       121
       121
       +
           export GOCACHE=$TMPDIR/go-cache

     

       122
       122
       +
           # this is compiled into the binary

     

       123
       123
       +
           export GOROOT_FINAL=$out/share/go

     

       124
       124
       +
       

     

       125
       125
       +
           export PATH=$(pwd)/bin:$PATH

     

       126
       126
       +
       

     

       127
       127
       +
           ${lib.optionalString isCross ''

     

       128
       128
       +
           # Independent from host/target, CC should produce code for the building system.

     

       129
       129
       +
           # We only set it when cross-compiling.

     

       130
       130
       +
           export CC=${buildPackages.stdenv.cc}/bin/cc

     

       131
       131
       +
           ''}

     

       132
       132
       +
           ulimit -a

     

       133
       133
       +
       

     

       134
       134
       +
           pushd src

     

       135
       135
       +
           ./make.bash

     

       136
       136
       +
           popd

     

       137
       137
       +
           runHook postBuild

     

       138
       138
       +
         '';

     

       139
       139
       +
       

     

       140
       140
       +
         preInstall = ''

     

       141
       141
       +
           # Contains the wrong perl shebang when cross compiling,

     

       142
       142
       +
           # since it is not used for anything we can deleted as well.

     

       143
       143
       +
           rm src/regexp/syntax/make_perl_groups.pl

     

       144
       144
       +
         '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''

     

       145
       145
       +
           mv bin/*_*/* bin

     

       146
       146
       +
           rmdir bin/*_*

     

       147
       147
       +
           ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''

     

       148
       148
       +
             rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}

     

       149
       149
       +
           ''}

     

       150
       150
       +
         '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''

     

       151
       151
       +
           rm -rf bin/*_*

     

       152
       152
       +
           ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''

     

       153
       153
       +
             rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}

     

       154
       154
       +
           ''}

     

       155
       155
       +
         '');

     

       156
       156
       +
       

     

       157
       157
       +
         installPhase = ''

     

       158
       158
       +
           runHook preInstall

     

       159
       159
       +
           mkdir -p $GOROOT_FINAL

     

       160
       160
       +
           cp -a bin pkg src lib misc api doc $GOROOT_FINAL

     

       161
       161
       +
           mkdir -p $out/bin

     

       162
       162
       +
           ln -s $GOROOT_FINAL/bin/* $out/bin

     

       163
       163
       +
           runHook postInstall

     

       164
       164
       +
         '';

     

       165
       165
       +
       

     

       166
       166
       +
         disallowedReferences = [ goBootstrap ];

     

       167
       167
       +
       

     

       168
       168
       +
         passthru = {

     

       169
       169
       +
           inherit goBootstrap skopeoTest;

     

       170
       170
       +
           tests = {

     

       171
       171
       +
             skopeo = testers.testVersion { package = skopeoTest; };

     

       172
       172
       +
           };

     

       173
       173
       +
         };

     

       174
       174
       +
       

     

       175
       175
       +
         meta = with lib; {

     

       176
       176
       +
           changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor version}";

     

       177
       177
       +
           description = "The Go Programming language";

     

       178
       178
       +
           homepage = "https://go.dev/";

     

       179
       179
       +
           license = licenses.bsd3;

     

       180
       180
       +
           maintainers = teams.golang.members;

     

       181
       181
       +
           platforms = platforms.darwin ++ platforms.linux;

     

       182
       182
       +
         };

     

       183
       183
       +
       }

+23

pkgs/development/compilers/go/go_no_vendor_checks-1.21.patch

···

       1
       1
       +
       Starting from go1.14, go verifes that vendor/modules.txt matches the requirements

     

       2
       2
       +
       and replacements listed in the main module go.mod file, and it is a hard failure if

     

       3
       3
       +
       vendor/modules.txt is missing.

     

       4
       4
       +
       

     

       5
       5
       +
       Relax module consistency checks and switch back to pre go1.14 behaviour if

     

       6
       6
       +
       vendor/modules.txt is missing regardless of go version requirement in go.mod.

     

       7
       7
       +
       

     

       8
       8
       +
       This has been ported from FreeBSD: https://reviews.freebsd.org/D24122

     

       9
       9
       +
       See https://github.com/golang/go/issues/37948 for discussion.

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go

     

       12
       12
       +
       index ffc79bb93f..2d0311975d 100644

     

       13
       13
       +
       --- a/src/cmd/go/internal/modload/vendor.go

     

       14
       14
       +
       +++ b/src/cmd/go/internal/modload/vendor.go

     

       15
       15
       +
       @@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFile *modfile.File) {

     

       16
       16
       +
        	readVendorList(MainModules.mustGetSingleMainModule())

     

       17
       17
       +
       

     

       18
       18
       +
        	pre114 := false

     

       19
       19
       +
       -	if gover.Compare(index.goVersion, "1.14") < 0 {

     

       20
       20
       +
       +	if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {

     

       21
       21
       +
        		// Go versions before 1.14 did not include enough information in

     

       22
       22
       +
        		// vendor/modules.txt to check for consistency.

     

       23
       23
       +
        		// If we know that we're on an earlier version, relax the consistency check.

+12 -12

pkgs/development/compilers/openjdk/darwin/11.nix

···

       11
       11
        
         dist = {

     

       12
       12
        
           x86_64-darwin = {

     

       13
       13
        
             arch = "x64";

     

       14
       14
       -
             zuluVersion = "11.48.21";

     

       15
       15
       -
             jdkVersion = "11.0.11";

     

       16
       16
       -
             sha256 =

     

       17
       17
       -
               if enableJavaFX then "18bd9cd66d6abc6f8c627bc70278dc8fd4860e138e1dc9e170eddb89727ccc7b"

     

       18
       18
       -
               else "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6";

     

       14
       14
       +
             zuluVersion = "11.66.15";

     

       15
       15
       +
             jdkVersion = "11.0.20";

     

       16
       16
       +
             hash =

     

       17
       17
       +
               if enableJavaFX then "sha256-pVgCJkgYTlFeL7nkkMWLeJ/J8ELhgvWb7gzf3erZP7Y="

     

       18
       18
       +
               else "sha256-vKqxHP5Yb651g8bZ0xHGQ4Q1T7JjjrmgEuykw/Gh2f0=";

     

       19
       19
        
           };

     

       20
       20
        
       

     

       21
       21
        
           aarch64-darwin = {

     

       22
       22
        
             arch = "aarch64";

     

       23
       23
       -
             zuluVersion = "11.48.21";

     

       24
       24
       -
             jdkVersion = "11.0.11";

     

       25
       25
       -
             sha256 =

     

       26
       26
       -
               if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9"

     

       27
       27
       -
               else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc";

     

       23
       23
       +
             zuluVersion = "11.66.15";

     

       24
       24
       +
             jdkVersion = "11.0.20";

     

       25
       25
       +
             hash =

     

       26
       26
       +
               if enableJavaFX then "sha256-VoZo34SCUU+HHnTl6iLe0QBC+4VDkPP14N98oqSg9EQ="

     

       27
       27
       +
               else "sha256-djK8Kfikt9SSuT87x1p7YWMIlNuF0TZFYDWrKiTTiIU=";

     

       28
       28
        
           };

     

       29
       29
        
         }."${stdenv.hostPlatform.system}";

     

       30
       30
        
       

     

       31
       31
        
         jce-policies = fetchurl {

     

       32
       32
        
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       33
       33
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       33
       33
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";

     
···

       41
       41
        
       

     

       42
       42
        
           src = fetchurl {

     

       43
       43
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       44
       44
       -
             inherit (dist) sha256;

     

       44
       44
       +
             inherit (dist) hash;

     

       45
       45
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       46
       46
        
           };

     

       47
       47

+12 -12

pkgs/development/compilers/openjdk/darwin/16.nix

···

       11
       11
        
         dist = {

     

       12
       12
        
           x86_64-darwin = {

     

       13
       13
        
             arch = "x64";

     

       14
       14
       -
             zuluVersion = "16.30.15";

     

       15
       15
       -
             jdkVersion = "16.0.1";

     

       16
       16
       -
             sha256 =

     

       17
       17
       -
               if enableJavaFX then "cbb3b96d80a0675893f21dc51ba3f532049c501bd7dc4c8d1ee930e63032c745"

     

       18
       18
       -
               else "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z";

     

       14
       14
       +
             zuluVersion = "16.32.15";

     

       15
       15
       +
             jdkVersion = "16.0.2";

     

       16
       16
       +
             hash =

     

       17
       17
       +
               if enableJavaFX then "sha256-6URaSBNHQWLauO//kCuKXb4Z7AqyshWnoeJEyVRKgaY="

     

       18
       18
       +
               else "sha256-NXgBj/KixTknaCYbo3B+rOo11NImH5CDUIU0LhTCtMo=";

     

       19
       19
        
           };

     

       20
       20
        
       

     

       21
       21
        
           aarch64-darwin = {

     

       22
       22
        
             arch = "aarch64";

     

       23
       23
       -
             zuluVersion = "16.30.19";

     

       24
       24
       -
             jdkVersion = "16.0.1";

     

       25
       25
       -
             sha256 =

     

       26
       26
       -
               if enableJavaFX then "a49b23abfd83784d2ac935fc24e25ab7cb09b8ffc8e47c32ed446e05b8a21396"

     

       27
       27
       -
               else "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w";

     

       23
       23
       +
             zuluVersion = "16.32.15";

     

       24
       24
       +
             jdkVersion = "16.0.2";

     

       25
       25
       +
             hash =

     

       26
       26
       +
               if enableJavaFX then "sha256-QuyhIAxUY3Vv1adGihW+LIsXtpDX2taCmFsMFj9o5vs="

     

       27
       27
       +
               else "sha256-3bUfDcLLyahLeURFAgLAVapBZHvqtam8GHbWTA6MQog=";

     

       28
       28
        
           };

     

       29
       29
        
         }."${stdenv.hostPlatform.system}";

     

       30
       30
        
       

     

       31
       31
        
         jce-policies = fetchurl {

     

       32
       32
        
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       33
       33
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       33
       33
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";

     
···

       41
       41
        
       

     

       42
       42
        
           src = fetchurl {

     

       43
       43
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       44
       44
       -
             inherit (dist) sha256;

     

       44
       44
       +
             inherit (dist) hash;

     

       45
       45
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       46
       46
        
           };

     

       47
       47

+9 -10

pkgs/development/compilers/openjdk/darwin/17.nix

···

       5
       5
        
         dist = {

     

       6
       6
        
           x86_64-darwin = {

     

       7
       7
        
             arch = "x64";

     

       8
       8
       -
             zuluVersion = "17.34.19";

     

       9
       9
       -
             jdkVersion = "17.0.3";

     

       10
       10
       -
             sha256 = "sha256-qImyxVC2y2QhxuVZwamKPyo46+n+7ytIFXpYI0e6w2c=";

     

       8
       8
       +
             zuluVersion = "17.44.15";

     

       9
       9
       +
             jdkVersion = "17.0.8";

     

       10
       10
       +
             hash = "sha256-Ci18gBkAv/UUIQw9KlnfibcQMXwQRGx6K7L/NBB7b7Q=";

     

       11
       11
        
           };

     

       12
       12
        
       

     

       13
       13
        
           aarch64-darwin = {

     

       14
       14
        
             arch = "aarch64";

     

       15
       15
       -
             zuluVersion = "17.34.19";

     

       16
       16
       -
             jdkVersion = "17.0.3";

     

       17
       17
       -
             sha256 = "sha256-eaRX8Qa/Mqr9JhpHSEcf0Q9c4qmqLMgWqRhkEEwAjf8=";

     

       15
       15
       +
             zuluVersion = "17.44.15";

     

       16
       16
       +
             jdkVersion = "17.0.8";

     

       17
       17
       +
             hash = "sha256-8b81QY6DGXVOsTKM8QDzJnYjXV0ipCbYWaaz6oF2A6k=";

     

       18
       18
        
           };

     

       19
       19
        
         }."${stdenv.hostPlatform.system}";

     

       20
       20
        
       

     

       21
       21
        
         jce-policies = fetchurl {

     

       22
       22
       -
           # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!

     

       23
       23
       -
           url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       24
       24
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       22
       22
       +
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       23
       23
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       25
       24
        
         };

     

       26
       25
        
       

     

       27
       26
        
         jdk = stdenv.mkDerivation rec {

     
···

       30
       29
        
       

     

       31
       30
        
           src = fetchurl {

     

       32
       31
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       33
       33
       -
             inherit (dist) sha256;

     

       32
       32
       +
             inherit (dist) hash;

     

       34
       33
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       35
       34
        
           };

     

       36
       35

+9 -10

pkgs/development/compilers/openjdk/darwin/18.nix

···

       5
       5
        
         dist = {

     

       6
       6
        
           x86_64-darwin = {

     

       7
       7
        
             arch = "x64";

     

       8
       8
       -
             zuluVersion = "18.28.13";

     

       9
       9
       -
             jdkVersion = "18.0.0";

     

       10
       10
       -
             sha256 = "0hc5m3d4q3n7sighq3pxkdg93vsrgj1kzla1py9nfnm9pnj9l2kq";

     

       8
       8
       +
             zuluVersion = "18.32.13";

     

       9
       9
       +
             jdkVersion = "18.0.2.1";

     

       10
       10
       +
             hash = "sha256-uHPcyOgxUdTgzmIVRp/awtwve9zSt+1TZNef7DUuoRg=";

     

       11
       11
        
           };

     

       12
       12
        
       

     

       13
       13
        
           aarch64-darwin = {

     

       14
       14
        
             arch = "aarch64";

     

       15
       15
       -
             zuluVersion = "18.28.13";

     

       16
       16
       -
             jdkVersion = "18.0.0";

     

       17
       17
       -
             sha256 = "0ch4jp2d4pjvxbmbswvjwf7w2flajrvjg5f16ggiy80y8l0y15cm";

     

       15
       15
       +
             zuluVersion = "18.32.13";

     

       16
       16
       +
             jdkVersion = "18.0.2.1";

     

       17
       17
       +
             hash = "sha256-jAZDgxtWMq/74yKAxA69oOU0C9nXvKG5MjmZLsK04iM=";

     

       18
       18
        
           };

     

       19
       19
        
         }."${stdenv.hostPlatform.system}";

     

       20
       20
        
       

     

       21
       21
        
         jce-policies = fetchurl {

     

       22
       22
       -
           # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!

     

       23
       23
       -
           url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       24
       24
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       22
       22
       +
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       23
       23
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       25
       24
        
         };

     

       26
       25
        
       

     

       27
       26
        
         jdk = stdenv.mkDerivation rec {

     
···

       30
       29
        
       

     

       31
       30
        
           src = fetchurl {

     

       32
       31
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       33
       33
       -
             inherit (dist) sha256;

     

       32
       32
       +
             inherit (dist) hash;

     

       34
       33
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       35
       34
        
           };

     

       36
       35

+9 -10

pkgs/development/compilers/openjdk/darwin/19.nix

···

       5
       5
        
         dist = {

     

       6
       6
        
           x86_64-darwin = {

     

       7
       7
        
             arch = "x64";

     

       8
       8
       -
             zuluVersion = "19.30.11";

     

       9
       9
       -
             jdkVersion = "19.0.1";

     

       10
       10
       -
             sha256 = "1h0qj0xgpxjy506ikbgdn74pi4860lsnh5n3q3bayfmn0pxc5ksn";

     

       8
       8
       +
             zuluVersion = "19.32.13";

     

       9
       9
       +
             jdkVersion = "19.0.2";

     

       10
       10
       +
             hash = "sha256-KARXWumsY+OcqpEOV2EL9SsPni1nGSipjRji/Mn2KsE=";

     

       11
       11
        
           };

     

       12
       12
        
       

     

       13
       13
        
           aarch64-darwin = {

     

       14
       14
        
             arch = "aarch64";

     

       15
       15
       -
             zuluVersion = "19.30.11";

     

       16
       16
       -
             jdkVersion = "19.0.1";

     

       17
       17
       -
             sha256 = "0g8i371h5fv686xhiff0431sgvdk80lbp2lkz86jpfdv9lgg0qnk";

     

       15
       15
       +
             zuluVersion = "19.32.13";

     

       16
       16
       +
             jdkVersion = "19.0.2";

     

       17
       17
       +
             hash = "sha256-F30FjZaLL756X/Xs6xjNwW9jds4pEATxoxOeeLL7Y5E=";

     

       18
       18
        
           };

     

       19
       19
        
         }."${stdenv.hostPlatform.system}";

     

       20
       20
        
       

     

       21
       21
        
         jce-policies = fetchurl {

     

       22
       22
       -
           # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!

     

       23
       23
       -
           url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       24
       24
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       22
       22
       +
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       23
       23
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       25
       24
        
         };

     

       26
       25
        
       

     

       27
       26
        
         jdk = stdenv.mkDerivation rec {

     
···

       30
       29
        
       

     

       31
       30
        
           src = fetchurl {

     

       32
       31
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       33
       33
       -
             inherit (dist) sha256;

     

       32
       32
       +
             inherit (dist) hash;

     

       34
       33
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       35
       34
        
           };

     

       36
       35

+9 -10

pkgs/development/compilers/openjdk/darwin/20.nix

···

       5
       5
        
         dist = {

     

       6
       6
        
           x86_64-darwin = {

     

       7
       7
        
             arch = "x64";

     

       8
       8
       -
             zuluVersion = "20.30.11";

     

       9
       9
       -
             jdkVersion = "20.0.1";

     

       10
       10
       -
             sha256 = "0hg2n2mdbpxsgpw3c58w8y1f3im6schvfqahji352p9ljbdykzmy";

     

       8
       8
       +
             zuluVersion = "20.32.11";

     

       9
       9
       +
             jdkVersion = "20.0.2";

     

       10
       10
       +
             hash = "sha256-Ev9KG6DvuBnsZrOguLsO1KQzudHCBcJNwKh45Inpnfo=";

     

       11
       11
        
           };

     

       12
       12
        
       

     

       13
       13
        
           aarch64-darwin = {

     

       14
       14
        
             arch = "aarch64";

     

       15
       15
       -
             zuluVersion = "20.30.11";

     

       16
       16
       -
             jdkVersion = "20.0.1";

     

       17
       17
       -
             sha256 = "0bc9h1y0b2azyfl3f5sqj19sh02xs995d1kdn55m4lfhc00rzr81";

     

       15
       15
       +
             zuluVersion = "20.32.11";

     

       16
       16
       +
             jdkVersion = "20.0.2";

     

       17
       17
       +
             hash = "sha256-15uNZ6uMfSASV3QU2q2oA/jBk2PCHOfSjn1GY7/7qIY=";

     

       18
       18
        
           };

     

       19
       19
        
         }."${stdenv.hostPlatform.system}";

     

       20
       20
        
       

     

       21
       21
        
         jce-policies = fetchurl {

     

       22
       22
       -
           # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!

     

       23
       23
       -
           url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       24
       24
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       22
       22
       +
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       23
       23
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       25
       24
        
         };

     

       26
       25
        
       

     

       27
       26
        
         jdk = stdenv.mkDerivation rec {

     
···

       30
       29
        
       

     

       31
       30
        
           src = fetchurl {

     

       32
       31
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       33
       33
       -
             inherit (dist) sha256;

     

       32
       32
       +
             inherit (dist) hash;

     

       34
       33
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       35
       34
        
           };

     

       36
       35

+12 -12

pkgs/development/compilers/openjdk/darwin/8.nix

···

       11
       11
        
         dist = {

     

       12
       12
        
           x86_64-darwin = {

     

       13
       13
        
             arch = "x64";

     

       14
       14
       -
             zuluVersion = "8.54.0.21";

     

       15
       15
       -
             jdkVersion = "8.0.292";

     

       16
       16
       -
             sha256 =

     

       17
       17
       -
               if enableJavaFX then "e671f8990229b1ca2a76faabb21ba2f1a9e1f7211392e0f657225559be9b05c8"

     

       18
       18
       -
               else "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in";

     

       14
       14
       +
             zuluVersion = "8.72.0.17";

     

       15
       15
       +
             jdkVersion = "8.0.382";

     

       16
       16
       +
             hash =

     

       17
       17
       +
               if enableJavaFX then "sha256-/x8FqygivzddXsOwIV8aj/u+LPXMmokgu97vLAVEv80="

     

       18
       18
       +
               else "sha256-3dTPIPGUeT6nb3gncNvEa4VTRyQIBJpp8oZadrT2ToE=";

     

       19
       19
        
           };

     

       20
       20
        
       

     

       21
       21
        
           aarch64-darwin = {

     

       22
       22
        
             arch = "aarch64";

     

       23
       23
       -
             zuluVersion = "8.54.0.21";

     

       24
       24
       -
             jdkVersion = "8.0.292";

     

       25
       25
       -
             sha256 =

     

       26
       26
       -
               if enableJavaFX then "8e901075cde2c31f531a34e8321ea4201970936abf54240a232e9389952afe84"

     

       27
       27
       -
               else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c";

     

       23
       23
       +
             zuluVersion = "8.72.0.17";

     

       24
       24
       +
             jdkVersion = "8.0.382";

     

       25
       25
       +
             hash =

     

       26
       26
       +
               if enableJavaFX then "sha256-FkQ+0MzSZWUzc/HmiDVZEHGOrdKAVCdK5pm9wXXzzaU="

     

       27
       27
       +
               else "sha256-rN5AI4xAWppE4kJlzMod0JmGyHdHjTXYtx8/wOW6CFk=";

     

       28
       28
        
           };

     

       29
       29
        
         }."${stdenv.hostPlatform.system}";

     

       30
       30
        
       

     

       31
       31
        
         jce-policies = fetchurl {

     

       32
       32
        
           url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";

     

       33
       33
       -
           sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";

     

       33
       33
       +
           hash = "sha256-gCGii4ysQbRPFCH9IQoKCCL8r4jWLS5wo1sv9iioZ1o=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk";

     
···

       44
       44
        
       

     

       45
       45
        
           src = fetchurl {

     

       46
       46
        
             url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz";

     

       47
       47
       -
             inherit (dist) sha256;

     

       47
       47
       +
             inherit (dist) hash;

     

       48
       48
        
             curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";

     

       49
       49
        
           };

     

       50
       50

+1 -1

pkgs/development/interpreters/guile/setup-hook-1.8.sh

···

       1
       1
        
       addGuileLibPath () {

     

       2
       2
        
           if test -d "$1/share/guile/site"; then

     

       3
       3
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

     

       3
       3
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"

     

       4
       4
        
           fi

     

       5
       5
        
       }

     

       6
       6

+6 -6

pkgs/development/interpreters/guile/setup-hook-2.0.sh

···

       1
       1
        
       addGuileLibPath () {

     

       2
       2
        
           if test -d "$1/share/guile/site/2.0"; then

     

       3
       3
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"

     

       4
       4
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"

     

       3
       3
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site/2.0"

     

       4
       4
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site/2.0"

     

       5
       5
        
           elif test -d "$1/share/guile/site"; then

     

       6
       6
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

     

       7
       7
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"

     

       6
       6
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"

     

       7
       7
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site"

     

       8
       8
        
           fi

     

       9
       9
        
       

     

       10
       10
        
           if test -d "$1/lib/guile/2.0/ccache"; then

     

       11
       11
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/ccache"

     

       11
       11
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.0/ccache"

     

       12
       12
        
           fi

     

       13
       13
        
       

     

       14
       14
        
           if test -d "$1/lib/guile/2.0/site-ccache"; then

     

       15
       15
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.0/site-ccache"

     

       15
       15
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.0/site-ccache"

     

       16
       16
        
           fi

     

       17
       17
        
       }

     

       18
       18

+6 -6

pkgs/development/interpreters/guile/setup-hook-2.2.sh

···

       1
       1
        
       addGuileLibPath () {

     

       2
       2
        
           if test -d "$1/share/guile/site/2.2"; then

     

       3
       3
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"

     

       4
       4
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"

     

       3
       3
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site/2.2"

     

       4
       4
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site/2.2"

     

       5
       5
        
           elif test -d "$1/share/guile/site"; then

     

       6
       6
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

     

       7
       7
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"

     

       6
       6
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"

     

       7
       7
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site"

     

       8
       8
        
           fi

     

       9
       9
        
       

     

       10
       10
        
           if test -d "$1/lib/guile/2.2/ccache"; then

     

       11
       11
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/ccache"

     

       11
       11
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.2/ccache"

     

       12
       12
        
           fi

     

       13
       13
        
       

     

       14
       14
        
           if test -d "$1/lib/guile/2.2/site-ccache"; then

     

       15
       15
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/2.2/site-ccache"

     

       15
       15
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/2.2/site-ccache"

     

       16
       16
        
           fi

     

       17
       17
        
       }

     

       18
       18

+9 -9

pkgs/development/interpreters/guile/setup-hook-3.0.sh

···

       1
       1
        
       addGuileLibPath () {

     

       2
       2
        
           if test -d "$1/share/guile/site/3.0"; then

     

       3
       3
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/3.0"

     

       4
       4
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/3.0"

     

       5
       5
       -
               export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/share/guile/site/3.0"

     

       3
       3
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site/3.0"

     

       4
       4
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site/3.0"

     

       5
       5
       +
               addToSearchPath GUILE_EXTENSIONS_PATH "$1/share/guile/site/3.0"

     

       6
       6
        
           elif test -d "$1/share/guile/site"; then

     

       7
       7
       -
               export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"

     

       8
       8
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"

     

       9
       9
       -
               export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/share/guile/site"

     

       7
       7
       +
               addToSearchPath GUILE_LOAD_PATH "$1/share/guile/site"

     

       8
       8
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/share/guile/site"

     

       9
       9
       +
               addToSearchPath GUILE_EXTENSIONS_PATH "$1/share/guile/site"

     

       10
       10
        
           fi

     

       11
       11
        
       

     

       12
       12
        
           if test -d "$1/lib/guile/3.0/ccache"; then

     

       13
       13
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/ccache"

     

       13
       13
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/3.0/ccache"

     

       14
       14
        
           fi

     

       15
       15
        
       

     

       16
       16
        
           if test -d "$1/lib/guile/3.0/site-ccache"; then

     

       17
       17
       -
               export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/lib/guile/3.0/site-ccache"

     

       17
       17
       +
               addToSearchPath GUILE_LOAD_COMPILED_PATH "$1/lib/guile/3.0/site-ccache"

     

       18
       18
        
           fi

     

       19
       19
        
       

     

       20
       20
        
           if test -d "$1/lib/guile/3.0/extensions"; then

     

       21
       21
       -
               export GUILE_EXTENSIONS_PATH="${GUILE_EXTENSIONS_PATH-}${GUILE_EXTENSIONS_PATH:+:}$1/lib/guile/3.0/extensions"

     

       21
       21
       +
               addToSearchPath GUILE_EXTENSIONS_PATH "$1/lib/guile/3.0/extensions"

     

       22
       22
        
           fi

     

       23
       23
        
       }

     

       24
       24

+4 -4

pkgs/development/interpreters/python/hooks/default.nix

···

       1
       1
       -
       self: super: with self;

     

       1
       1
       +
       self: dontUse: with self;

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         pythonInterpreter = super.python.pythonForBuild.interpreter;

     

       5
       5
       -
         pythonSitePackages = super.python.sitePackages;

     

       6
       6
       -
         pythonCheckInterpreter = super.python.interpreter;

     

       4
       4
       +
         pythonInterpreter = python.pythonForBuild.interpreter;

     

       5
       5
       +
         pythonSitePackages = python.sitePackages;

     

       6
       6
       +
         pythonCheckInterpreter = python.interpreter;

     

       7
       7
        
         setuppy = ../run_setup.py;

     

       8
       8
        
       in {

     

       9
       9
        
         makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args);

+3 -2

pkgs/development/interpreters/python/passthrufun.nix

···

       47
       47
        
               selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget.

     

       48
       48
        
             };

     

       49
       49
        
             hooks = import ./hooks/default.nix;

     

       50
       50
       -
             keep = lib.extends hooks pythonPackagesFun;

     

       50
       50
       +
             keep = self: hooks self {};

     

       51
       51
        
             extra = _: {};

     

       52
       52
        
             optionalExtensions = cond: as: lib.optionals cond as;

     

       53
       53
        
             pythonExtension = import ../../../top-level/python-packages.nix;

     

       54
       54
        
             python2Extension = import ../../../top-level/python2-packages.nix;

     

       55
       55
        
             extensions = lib.composeManyExtensions ([

     

       56
       56
       +
               hooks

     

       56
       57
        
               pythonExtension

     

       57
       58
        
             ] ++ (optionalExtensions (!self.isPy3k) [

     

       58
       59
        
               python2Extension

     
···

       64
       65
        
             otherSplices

     

       65
       66
        
             keep

     

       66
       67
        
             extra

     

       67
       67
       -
             (lib.extends (lib.composeExtensions aliases extensions) keep))

     

       68
       68
       +
             (lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))

     

       68
       69
        
           {

     

       69
       70
        
             overrides = packageOverrides;

     

       70
       71
        
             python = self;

+2 -2

pkgs/development/interpreters/ruby/rubygems/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "rubygems";

     

       5
       5
       -
         version = "3.4.17";

     

       5
       5
       +
         version = "3.4.18";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";

     

       9
       9
       -
           hash = "sha256-SvqqlGPiqHeZQ0Mvulbgc5bM7E1O3HK7BtnbiscG0vE=";

     

       9
       9
       +
           hash = "sha256-+yHTJWedZNCkkRMIRT103QMTFJODlbJ2PwVbTghEo0M=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = [

+7

pkgs/development/libraries/abseil-cpp/202301.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , cmake

     

       5
       5
       +
       , gtest

     

       5
       6
        
       , static ? stdenv.hostPlatform.isStatic

     

       6
       7
        
       , cxxStandard ? null

     

       7
       8
        
       }:

     
···

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         cmakeFlags = [

     

       22
       22
       +
           "-DABSL_BUILD_TEST_HELPERS=ON"

     

       23
       23
       +
           "-DABSL_USE_EXTERNAL_GOOGLETEST=ON"

     

       21
       24
        
           "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"

     

       22
       25
        
         ] ++ lib.optionals (cxxStandard != null) [

     

       23
       26
        
           "-DCMAKE_CXX_STANDARD=${cxxStandard}"

     

       24
       27
        
         ];

     

       25
       28
        
       

     

       29
       29
       +
         strictDeps = true;

     

       30
       30
       +
       

     

       26
       31
        
         nativeBuildInputs = [ cmake ];

     

       32
       32
       +
       

     

       33
       33
       +
         buildInputs = [ gtest ];

     

       27
       34
        
       

     

       28
       35
        
         meta = with lib; {

     

       29
       36
        
           description = "An open-source collection of C++ code designed to augment the C++ standard library";

+2 -2

pkgs/development/libraries/audio/roc-toolkit/default.nix

···

       21
       21
        
       

     

       22
       22
        
       stdenv.mkDerivation rec {

     

       23
       23
        
         pname = "roc-toolkit";

     

       24
       24
       -
         version = "0.2.4";

     

       24
       24
       +
         version = "0.2.5";

     

       25
       25
        
       

     

       26
       26
        
         outputs = [ "out" "dev" ];

     

       27
       27
        
       

     
···

       29
       29
        
           owner = "roc-streaming";

     

       30
       30
        
           repo = "roc-toolkit";

     

       31
       31
        
           rev = "v${version}";

     

       32
       32
       -
           hash = "sha256-x4+/MIFKcos9xWhvSNWdsUQA2oLiyYS0MJE60HY/3hQ=";

     

       32
       32
       +
           hash = "sha256-vosw4H3YTTCXdDOnQQYRNZgufPo1BxUtfg6jutArzTI=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

+34

pkgs/development/libraries/fortify-headers/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation {

     

       7
       7
       +
         pname = "fortify-headers";

     

       8
       8
       +
         version = "1.1alpine1";

     

       9
       9
       +
       

     

       10
       10
       +
         # upstream only accessible via git - unusable during bootstrap, hence

     

       11
       11
       +
         # extract from the alpine package

     

       12
       12
       +
         src = fetchurl {

     

       13
       13
       +
           url = "https://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/fortify-headers-1.1-r1.apk";

     

       14
       14
       +
           name = "fortify-headers.tar.gz";  # ensure it's extracted as a .tar.gz

     

       15
       15
       +
           hash = "sha256-A67NzUv+dldARY+MTaoVnezTg+Es8ZK/b7XOxA6KzpI=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           runHook preInstall

     

       20
       20
       +
       

     

       21
       21
       +
           mkdir -p $out

     

       22
       22
       +
           cp -r include/fortify $out/include

     

       23
       23
       +
       

     

       24
       24
       +
           runHook postInstall

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "Standalone header-based fortify-source implementation";

     

       29
       29
       +
           homepage = "https://git.2f30.org/fortify-headers";

     

       30
       30
       +
           license = lib.licenses.bsd0;

     

       31
       31
       +
           platforms = lib.platforms.all;

     

       32
       32
       +
           maintainers = with lib.maintainers; [ ris ];

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+3 -2

pkgs/development/libraries/gdk-pixbuf/default.nix

···

       143
       143
        
             pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       144
       144
        
           };

     

       145
       145
        
       

     

       146
       146
       -
           # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc

     

       147
       147
       -
           moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";

     

       146
       146
       +
           # gdk_pixbuf_binarydir and gdk_pixbuf_moduledir variables from gdk-pixbuf-2.0.pc

     

       147
       147
       +
           binaryDir = "lib/gdk-pixbuf-2.0/2.10.0";

     

       148
       148
       +
           moduleDir = "${finalAttrs.passthru.binaryDir}/loaders";

     

       148
       149
        
         };

     

       149
       150
        
       

     

       150
       151
        
         meta = with lib; {

+6 -3

pkgs/development/libraries/glibc/locales.nix

···

       12
       12
        
       

     

       13
       13
        
       (callPackage ./common.nix { inherit stdenv; } {

     

       14
       14
        
         pname = "glibc-locales";

     

       15
       15
       +
         extraNativeBuildInputs = [ glibc ];

     

       15
       16
        
       }).overrideAttrs(finalAttrs: previousAttrs: {

     

       16
       17
        
       

     

       17
       18
        
         builder = ./locales-builder.sh;

     

       18
       19
        
       

     

       19
       20
        
         outputs = [ "out" ];

     

       20
       20
       -
       

     

       21
       21
       -
         extraNativeBuildInputs = [ glibc ];

     

       22
       21
        
       

     

       23
       22
        
         LOCALEDEF_FLAGS = [

     

       24
       23
        
           (if stdenv.hostPlatform.isLittleEndian

     
···

       60
       59
        
             echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED

     

       61
       60
        
           '';

     

       62
       61
        
       

     

       63
       63
       -
         enableParallelBuilding = true;

     

       62
       62
       +
         # Current `nixpkgs` way of building locales is not compatible with

     

       63
       63
       +
         # parallel install. `locale-archive` is updated in parallel with

     

       64
       64
       +
         # multiple `localedef` processes and causes non-deterministic result:

     

       65
       65
       +
         #   https://github.com/NixOS/nixpkgs/issues/245360

     

       66
       66
       +
         enableParallelBuilding = false;

     

       64
       67
        
       

     

       65
       68
        
         makeFlags = (previousAttrs.makeFlags or []) ++ [

     

       66
       69
        
           "localedata/install-locales"

-19

pkgs/development/libraries/gmp/6.2.1-CVE-2021-43618.patch

···

       1
       1
       -
       https://gmplib.org/repo/gmp-6.2/raw-rev/561a9c25298e

     

       2
       2
       -
       

     

       3
       3
       -
       diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c

     

       4
       4
       -
       --- a/mpz/inp_raw.c	Tue Dec 22 23:49:51 2020 +0100

     

       5
       5
       -
       +++ b/mpz/inp_raw.c	Thu Oct 21 19:06:49 2021 +0200

     

       6
       6
       -
       @@ -88,8 +88,11 @@

     

       7
       7
       -
        

     

       8
       8
       -
          abs_csize = ABS (csize);

     

       9
       9
       -
        

     

       10
       10
       -
       +  if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))

     

       11
       11
       -
       +    return 0; /* Bit size overflows */

     

       12
       12
       -
       +

     

       13
       13
       -
          /* round up to a multiple of limbs */

     

       14
       14
       -
       -  abs_xsize = BITS_TO_LIMBS (abs_csize*8);

     

       15
       15
       -
       +  abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8);

     

       16
       16
       -
        

     

       17
       17
       -
          if (abs_xsize != 0)

     

       18
       18
       -
            {

     

       19
       19
       -

+2 -4

pkgs/development/libraries/gmp/6.x.nix

···

       13
       13
        
       

     

       14
       14
        
       let self = stdenv.mkDerivation rec {

     

       15
       15
        
         pname = "gmp${lib.optionalString cxx "-with-cxx"}";

     

       16
       16
       -
         version = "6.2.1";

     

       16
       16
       +
         version = "6.3.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv

     

       19
       19
        
           urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ];

     

       20
       20
       -
           sha256 = "0z2ddfiwgi0xbf65z4fg4hqqzlhv0cc6hdcswf3c6n21xdmk5sga";

     

       20
       20
       +
           hash = "sha256-rCghGnz7YJuuLiyNYFjWbI/pZDT3QM9v4uR7AA0cIMs=";

     

       21
       21
        
         };

     

       22
       22
       -
       

     

       23
       23
       -
         patches = [ ./6.2.1-CVE-2021-43618.patch ];

     

       24
       22
        
       

     

       25
       23
        
         #outputs TODO: split $cxx due to libstdc++ dependency

     

       26
       24
        
         # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added

+8 -9

pkgs/development/libraries/gnu-config/default.nix

···

       6
       6
        
       # files.

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         rev = "63acb96f92473ceb5e21d873d7c0aee266b3d6d3";

     

       9
       9
       +
         rev = "d4e37b5868ef910e3e52744c34408084bb13051c";

     

       10
       10
        
       

     

       11
       11
        
         # Don't use fetchgit as this is needed during Aarch64 bootstrapping

     

       12
       12
        
         configGuess = fetchurl {

     

       13
       13
       +
           name = "config.guess-${builtins.substring 0 7 rev}";

     

       13
       14
        
           url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";

     

       14
       14
       -
           sha256 = "049qgfh4xjd4fxd7ygm1phd5faqphfvhfcv8dsdldprsp86lf55v";

     

       15
       15
       +
           sha256 = "191czpnbc1nxrygg8fd3839y1f4m9x43rp57vgrsas6p07zzh3c1";

     

       15
       16
        
         };

     

       16
       17
        
         configSub = fetchurl {

     

       18
       18
       +
           name = "config.sub-${builtins.substring 0 7 rev}";

     

       17
       19
        
           url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";

     

       18
       18
       -
           sha256 = "1rk30y27mzls49wyfdb5jhzjr08hkxl7xqhnxmhcmkvqlmpsjnxl";

     

       20
       20
       +
           sha256 = "0148p54gw10p6sk2rn3gi9vvqm89rk8kcvl9335ckayhanx31381";

     

       19
       21
        
         };

     

       20
       22
        
       in stdenv.mkDerivation {

     

       21
       23
        
         pname = "gnu-config";

     

       22
       22
       -
         version = "2023-01-21";

     

       24
       24
       +
         version = "2023-07-31";

     

       23
       25
        
       

     

       24
       26
        
         buildCommand = ''

     

       25
       25
       -
           mkdir -p $out

     

       26
       26
       -
           cp ${configGuess} $out/config.guess

     

       27
       27
       -
           cp ${configSub} $out/config.sub

     

       28
       28
       -
       

     

       29
       29
       -
           chmod +x $out/config.*

     

       27
       27
       +
           install -Dm755 ${configGuess} $out/config.guess

     

       28
       28
       +
           install -Dm755 ${configSub} $out/config.sub

     

       30
       29
        
         '';

     

       31
       30
        
       

     

       32
       31
        
         meta = with lib; {

+13 -4

pkgs/development/libraries/gnutls/default.nix

···

       1
       1
        
       { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip

     

       2
       2
        
       , perl, gmp, autoconf, automake, libidn2, libiconv

     

       3
       3
       +
       , fetchpatch, texinfo

     

       3
       4
        
       , unbound, dns-root-data, gettext, util-linux

     

       4
       5
        
       , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so

     

       5
       6
        
       , tpmSupport ? false, trousers, which, nettools, libunistring

     
···

       33
       34
        
       

     

       34
       35
        
       stdenv.mkDerivation rec {

     

       35
       36
        
         pname = "gnutls";

     

       36
       36
       -
         version = "3.8.0";

     

       37
       37
       +
         version = "3.8.1";

     

       37
       38
        
       

     

       38
       39
        
         src = fetchurl {

     

       39
       40
        
           url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";

     

       40
       40
       -
           sha256 = "sha256-DqDRGhZgoeY/lg8Vexl6vm0MjLMlW+JOH7OBWTC5vcU=";

     

       41
       41
       +
           hash = "sha256-uoueFa4gq6iPRGYZePW1hjSUMW/n5yLt6dBp/mKUgpw=";

     

       41
       42
        
         };

     

       42
       43
        
       

     

       43
       44
        
         outputs = [ "bin" "dev" "out" "man" "devdoc" ];

     
···

       45
       46
        
         outputInfo = "devdoc";

     

       46
       47
        
         outputDoc  = "devdoc";

     

       47
       48
        
       

     

       48
       48
       -
         patches = [ ./nix-ssl-cert-file.patch ];

     

       49
       49
       +
         patches = [

     

       50
       50
       +
           (fetchpatch { #TODO: when updating drop this patch and texinfo

     

       51
       51
       +
             name = "GNUTLS_NO_EXTENSIONS.patch";

     

       52
       52
       +
             url = "https://gitlab.com/gnutls/gnutls/-/commit/abfa8634db940115a11a07596ce53c8f9c4f87d2.diff";

     

       53
       53
       +
             hash = "sha256-3M5WdNoVx9gUwTUPgu/sXmsaNg+j5d6liXs0UZz8fGU=";

     

       54
       54
       +
           })

     

       55
       55
       +
       

     

       56
       56
       +
           ./nix-ssl-cert-file.patch

     

       57
       57
       +
         ];

     

       49
       58
        
       

     

       50
       59
        
         # Skip some tests:

     

       51
       60
        
         #  - pkg-config: building against the result won't work before installing (3.5.11)

     
···

       80
       89
        
           ++ lib.optional (withP11-kit) p11-kit

     

       81
       90
        
           ++ lib.optional (tpmSupport && stdenv.isLinux) trousers;

     

       82
       91
        
       

     

       83
       83
       -
         nativeBuildInputs = [ perl pkg-config ]

     

       92
       92
       +
         nativeBuildInputs = [ perl pkg-config texinfo ]

     

       84
       93
        
           ++ lib.optionals doCheck [ which nettools util-linux ];

     

       85
       94
        
       

     

       86
       95
        
         propagatedBuildInputs = [ nettle ]

+28

pkgs/development/libraries/libavif/default.nix

···

       8
       8
        
       , libjpeg

     

       9
       9
        
       , dav1d

     

       10
       10
        
       , libyuv

     

       11
       11
       +
       , gdk-pixbuf

     

       12
       12
       +
       , makeWrapper

     

       11
       13
        
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       let

     

       16
       16
       +
         gdkPixbufModuleDir = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";

     

       17
       17
       +
         gdkPixbufModuleFile = "${placeholder "out"}/${gdk-pixbuf.binaryDir}/avif-loaders.cache";

     

       18
       18
       +
       in

     

       12
       19
        
       

     

       13
       20
        
       stdenv.mkDerivation rec {

     

       14
       21
        
         pname = "libavif";

     
···

       29
       36
        
           "-DAVIF_CODEC_DAV1D=ON" # best decoder (fast)

     

       30
       37
        
           "-DAVIF_CODEC_AOM_DECODE=OFF"

     

       31
       38
        
           "-DAVIF_BUILD_APPS=ON"

     

       39
       39
       +
           "-DAVIF_BUILD_GDK_PIXBUF=ON"

     

       32
       40
        
         ];

     

       33
       41
        
       

     

       34
       42
        
         nativeBuildInputs = [

     

       35
       43
        
           cmake

     

       36
       44
        
           pkg-config

     

       45
       45
       +
           gdk-pixbuf

     

       46
       46
       +
           makeWrapper

     

       37
       47
        
         ];

     

       38
       48
        
       

     

       39
       49
        
         buildInputs = [

     

       50
       50
       +
           gdk-pixbuf

     

       40
       51
        
           libaom

     

       41
       52
        
           zlib

     

       42
       53
        
           libpng

     
···

       44
       55
        
           dav1d

     

       45
       56
        
           libyuv

     

       46
       57
        
         ];

     

       58
       58
       +
       

     

       59
       59
       +
         postPatch = ''

     

       60
       60
       +
           substituteInPlace contrib/gdk-pixbuf/avif.thumbnailer.in \

     

       61
       61
       +
             --replace '@CMAKE_INSTALL_FULL_BINDIR@/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-avif"

     

       62
       62
       +
         '';

     

       63
       63
       +
       

     

       64
       64
       +
         env.PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = gdkPixbufModuleDir;

     

       65
       65
       +
       

     

       66
       66
       +
         postInstall = ''

     

       67
       67
       +
           GDK_PIXBUF_MODULEDIR=${gdkPixbufModuleDir} \

     

       68
       68
       +
           GDK_PIXBUF_MODULE_FILE=${gdkPixbufModuleFile} \

     

       69
       69
       +
           gdk-pixbuf-query-loaders --update-cache

     

       70
       70
       +
       

     

       71
       71
       +
           mkdir -p "$out/bin"

     

       72
       72
       +
           makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-avif" \

     

       73
       73
       +
             --set GDK_PIXBUF_MODULE_FILE ${gdkPixbufModuleFile}

     

       74
       74
       +
         '';

     

       47
       75
        
       

     

       48
       76
        
         meta = with lib; {

     

       49
       77
        
           description  = "C implementation of the AV1 Image File Format";

+1 -1

pkgs/development/libraries/libhwy/default.nix

···

       10
       10
        
           rev = version;

     

       11
       11
        
           hash = "sha256-Gym2iHq5ws9kuG4HWSQndD8hVugV4USZt6dUFnEkLwY=";

     

       12
       12
        
         };

     

       13
       13
       -
         patches = lib.optionals (with stdenv; isAarch64 && isLinux) [ # conditional, temporarily

     

       13
       13
       +
         patches = [

     

       14
       14
        
           # backport for compilation issue on aarch64

     

       15
       15
        
           # https://github.com/google/highway/issues/1613

     

       16
       16
        
           (fetchpatch {

+10 -12

pkgs/development/libraries/librsvg/default.nix

···

       4
       4
        
       , pkg-config

     

       5
       5
        
       , glib

     

       6
       6
        
       , gdk-pixbuf

     

       7
       7
       +
       , installShellFiles

     

       7
       8
        
       , pango

     

       8
       9
        
       , cairo

     

       9
       10
        
       , libxml2

     
···

       59
       60
        
       

     

       60
       61
        
         nativeBuildInputs = [

     

       61
       62
        
           gdk-pixbuf

     

       63
       63
       +
           installShellFiles

     

       62
       64
        
           pkg-config

     

       63
       65
        
           rustc

     

       64
       66
        
           cargo-auditable-cargo-wrapper

     
···

       121
       123
        
         postConfigure = ''

     

       122
       124
        
           GDK_PIXBUF=$out/lib/gdk-pixbuf-2.0/2.10.0

     

       123
       125
        
           mkdir -p $GDK_PIXBUF/loaders

     

       124
       124
       -
           sed -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \

     

       125
       125
       -
               -i gdk-pixbuf-loader/Makefile

     

       126
       126
       -
           sed -e "s#gdk_pixbuf_cache_file = .*#gdk_pixbuf_cache_file = $GDK_PIXBUF/loaders.cache#" \

     

       127
       127
       -
               -i gdk-pixbuf-loader/Makefile

     

       128
       128
       -
           sed -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" \

     

       129
       129
       -
                -i gdk-pixbuf-loader/Makefile

     

       126
       126
       +
           sed -i gdk-pixbuf-loader/Makefile \

     

       127
       127
       +
             -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \

     

       128
       128
       +
             -e "s#gdk_pixbuf_cache_file = .*#gdk_pixbuf_cache_file = $GDK_PIXBUF/loaders.cache#" \

     

       129
       129
       +
             -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#"

     

       130
       130
        
       

     

       131
       131
        
           # Fix thumbnailer path

     

       132
       132
        
           sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \

     
···

       147
       147
        
             cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp

     

       148
       148
        
             mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache

     

       149
       149
        
       

     

       150
       150
       -
             mkdir -p "$out/share/bash-completion/completions/"

     

       151
       151
       -
             ${emulator} $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert"

     

       152
       152
       -
             mkdir -p "$out/share/zsh/site-functions/"

     

       153
       153
       -
             ${emulator} $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert"

     

       154
       154
       -
             mkdir -p "$out/share/fish/vendor_completions.d/"

     

       155
       155
       -
             ${emulator} $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish"

     

       150
       150
       +
             installShellCompletion --cmd rsvg-convert \

     

       151
       151
       +
               --bash <(${emulator} $out/bin/rsvg-convert --completion bash) \

     

       152
       152
       +
               --fish <(${emulator} $out/bin/rsvg-convert --completion fish) \

     

       153
       153
       +
               --zsh <(${emulator} $out/bin/rsvg-convert --completion zsh)

     

       156
       154
        
           '';

     

       157
       155
        
       

     

       158
       156
        
         postFixup = lib.optionalString withIntrospection ''

+2 -2

pkgs/development/libraries/openexr/3.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "openexr";

     

       12
       12
       -
         version = "3.1.7";

     

       12
       12
       +
         version = "3.1.10";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "AcademySoftwareFoundation";

     

       16
       16
        
           repo = "openexr";

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           sha256 = "sha256-Kl+aOA797aZvrvW4ZQNHdSU7YFPieZEzX3aYeaoH6eU=";

     

       18
       18
       +
           sha256 = "sha256-8oV7Himk9AS2e2Z3OREE7KQgFIUysXwATlUN51dDe5M=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         outputs = [ "bin" "dev" "out" "doc" ];

+2 -2

pkgs/development/libraries/openldap/default.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenv.mkDerivation rec {

     

       19
       19
        
         pname = "openldap";

     

       20
       20
       -
         version = "2.6.5";

     

       20
       20
       +
         version = "2.6.6";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchurl {

     

       23
       23
        
           url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";

     

       24
       24
       -
           hash = "sha256-Lieo1PTCr4/oQLVzJxwgqhY+JJh/l2UhRkQpD1vrONk=";

     

       24
       24
       +
           hash = "sha256-CC6ZjPVCmE1DY0RC2+EdqGB1nlEJBxUupXm9xC/jnqA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         # TODO: separate "out" and "bin"

-54

pkgs/development/libraries/openssl/3.0/CVE-2023-2975.patch

···

       1
       1
       -
       From 6a83f0c958811f07e0d11dfc6b5a6a98edfd5bdc Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Tomas Mraz <tomas@openssl.org>

     

       3
       3
       -
       Date: Tue, 4 Jul 2023 17:30:35 +0200

     

       4
       4
       -
       Subject: [PATCH] Do not ignore empty associated data with AES-SIV mode

     

       5
       5
       -
       

     

       6
       6
       -
       The AES-SIV mode allows for multiple associated data items

     

       7
       7
       -
       authenticated separately with any of these being 0 length.

     

       8
       8
       -
       

     

       9
       9
       -
       The provided implementation ignores such empty associated data

     

       10
       10
       -
       which is incorrect in regards to the RFC 5297 and is also

     

       11
       11
       -
       a security issue because such empty associated data then become

     

       12
       12
       -
       unauthenticated if an application expects to authenticate them.

     

       13
       13
       -
       

     

       14
       14
       -
       Fixes CVE-2023-2975

     

       15
       15
       -
       

     

       16
       16
       -
       Reviewed-by: Matt Caswell <matt@openssl.org>

     

       17
       17
       -
       Reviewed-by: Paul Dale <pauli@openssl.org>

     

       18
       18
       -
       (Merged from https://github.com/openssl/openssl/pull/21384)

     

       19
       19
       -
       

     

       20
       20
       -
       (cherry picked from commit c426c281cfc23ab182f7d7d7a35229e7db1494d9)

     

       21
       21
       -
       ---

     

       22
       22
       -
        .../implementations/ciphers/cipher_aes_siv.c   | 18 +++++++++++-------

     

       23
       23
       -
        1 file changed, 11 insertions(+), 7 deletions(-)

     

       24
       24
       -
       

     

       25
       25
       -
       diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c

     

       26
       26
       -
       index 45010b90db2a..b396c8651a32 100644

     

       27
       27
       -
       --- a/providers/implementations/ciphers/cipher_aes_siv.c

     

       28
       28
       -
       +++ b/providers/implementations/ciphers/cipher_aes_siv.c

     

       29
       29
       -
       @@ -120,14 +120,18 @@ static int siv_cipher(void *vctx, unsigned char *out, size_t *outl,

     

       30
       30
       -
            if (!ossl_prov_is_running())

     

       31
       31
       -
                return 0;

     

       32
       32
       -
        

     

       33
       33
       -
       -    if (inl == 0) {

     

       34
       34
       -
       -        *outl = 0;

     

       35
       35
       -
       -        return 1;

     

       36
       36
       -
       -    }

     

       37
       37
       -
       +    /* Ignore just empty encryption/decryption call and not AAD. */

     

       38
       38
       -
       +    if (out != NULL) {

     

       39
       39
       -
       +        if (inl == 0) {

     

       40
       40
       -
       +            if (outl != NULL)

     

       41
       41
       -
       +                *outl = 0;

     

       42
       42
       -
       +            return 1;

     

       43
       43
       -
       +        }

     

       44
       44
       -
        

     

       45
       45
       -
       -    if (outsize < inl) {

     

       46
       46
       -
       -        ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);

     

       47
       47
       -
       -        return 0;

     

       48
       48
       -
       +        if (outsize < inl) {

     

       49
       49
       -
       +            ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);

     

       50
       50
       -
       +            return 0;

     

       51
       51
       -
       +        }

     

       52
       52
       -
            }

     

       53
       53
       -
        

     

       54
       54
       -
            if (ctx->hw->cipher(ctx, out, in, inl) <= 0)

+2 -5

pkgs/development/libraries/openssl/default.nix

···

       254
       254
        
         };

     

       255
       255
        
       

     

       256
       256
        
         openssl_3 = common {

     

       257
       257
       -
           version = "3.0.9";

     

       258
       258
       -
           sha256 = "sha256-6xqwR4FHQ2D3fDGKuJ2MWgOrw45j1lpgPKu/GwCh3JA=";

     

       257
       257
       +
           version = "3.0.10";

     

       258
       258
       +
           sha256 = "sha256-F2HU9bE6ECi5tvPUuOF/6wztyTcPav5h1xk9LNzoMyM=";

     

       259
       259
        
           patches = [

     

       260
       260
        
             ./3.0/nix-ssl-cert-file.patch

     

       261
       261
        
       

     

       262
       262
        
             # openssl will only compile in KTLS if the current kernel supports it.

     

       263
       263
        
             # This patch disables build-time detection.

     

       264
       264
        
             ./3.0/openssl-disable-kernel-detection.patch

     

       265
       265
       -
       

     

       266
       266
       -
             # https://www.openssl.org/news/secadv/20230714.txt

     

       267
       267
       -
             ./3.0/CVE-2023-2975.patch

     

       268
       265
        
       

     

       269
       266
        
             (if stdenv.hostPlatform.isDarwin

     

       270
       267
        
              then ./use-etc-ssl-certs-darwin.patch

+6

pkgs/development/libraries/protobuf/3.23.nix

···

       1
       1
       +
       { callPackage, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       callPackage ./generic-v3-cmake.nix ({

     

       4
       4
       +
         version = "3.23.4";

     

       5
       5
       +
         sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg=";

     

       6
       6
       +
       } // args)

+6 -5

pkgs/development/libraries/protobuf/generic-v3-cmake.nix

···

       68
       68
        
           ];

     

       69
       69
        
       

     

       70
       70
        
           buildInputs = [

     

       71
       71
       -
             abseil-cpp

     

       72
       71
        
             zlib

     

       73
       72
        
           ];

     

       74
       73
        
       

     

       75
       75
       -
           # After 3.20, CMakeLists.txt can now be found at the top-level, however

     

       76
       76
       -
           # a stub cmake/CMakeLists.txt still exists for compatibility with previous build assumptions

     

       77
       77
       -
           cmakeDir = "../cmake";

     

       74
       74
       +
           propagatedBuildInputs = [

     

       75
       75
       +
             abseil-cpp

     

       76
       76
       +
           ];

     

       77
       77
       +
       

     

       78
       78
       +
           cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null;

     

       78
       79
        
           cmakeFlags = [

     

       79
       80
        
             "-Dprotobuf_ABSL_PROVIDER=package"

     

       80
       80
       -
             ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [

     

       81
       81
       +
           ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [

     

       81
       82
        
             "-Dprotobuf_BUILD_SHARED_LIBS=ON"

     

       82
       83
        
           ]

     

       83
       84
        
           # Tests fail to build on 32-bit platforms; fixed in 3.22

+4 -13

pkgs/development/libraries/protobufc/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       , autoreconfHook

     

       6
       5
        
       , pkg-config

     

       7
       6
        
       , protobuf

     
···

       11
       10
        
       

     

       12
       11
        
       stdenv.mkDerivation rec {

     

       13
       12
        
         pname = "protobuf-c";

     

       14
       14
       -
         version = "1.4.1";

     

       13
       13
       +
         version = "unstable-2023-07-08";

     

       15
       14
        
       

     

       16
       15
        
         src = fetchFromGitHub {

     

       17
       16
        
           owner = "protobuf-c";

     

       18
       17
        
           repo = "protobuf-c";

     

       19
       19
       -
           rev = "refs/tags/v${version}";

     

       20
       20
       -
           hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM=";

     

       18
       18
       +
           rev = "fa86fddbd000316772d1deb5a8d1201fa7599ef7";

     

       19
       19
       +
           hash = "sha256-pmqZYFREPgSrWPekymTglhtAv6gQR1gP3dOl3hqjYig=";

     

       21
       20
        
         };

     

       22
       21
        
       

     

       23
       23
       -
         patches = [

     

       24
       24
       -
           # https://github.com/protobuf-c/protobuf-c/pull/534

     

       25
       25
       -
           (fetchpatch {

     

       26
       26
       -
             url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch";

     

       27
       27
       -
             hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804=";

     

       28
       28
       -
           })

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       22
        
         nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       32
       23
        
       

     

       33
       24
        
         buildInputs = [ protobuf zlib ];

     

       34
       25
        
       

     

       35
       35
       -
         PROTOC = lib.getExe buildPackages.protobuf;

     

       26
       26
       +
         env.PROTOC = lib.getExe buildPackages.protobuf;

     

       36
       27
        
       

     

       37
       28
        
         meta = with lib; {

     

       38
       29
        
           homepage = "https://github.com/protobuf-c/protobuf-c/";

+3

pkgs/development/libraries/tix/default.nix

···

       21
       21
        
           })

     

       22
       22
        
           # Remove duplicated definition of XLowerWindow

     

       23
       23
        
           ./duplicated-xlowerwindow.patch

     

       24
       24
       +
           # Fix incompatible function pointer conversions and implicit definition of `panic`.

     

       25
       25
       +
           # `panic` is just `Tcl_Panic`, but it is not defined on Darwin due to a conflict with `mach/mach.h`.

     

       26
       26
       +
           ./fix-clang16.patch

     

       24
       27
        
         ] ++ lib.optional (tcl.release == "8.6")

     

       25
       28
        
         (fetchpatch {

     

       26
       29
        
           name = "tix-8.4.3-tcl8.6.patch";

+215

pkgs/development/libraries/tix/fix-clang16.patch

···

       1
       1
       +
       diff -ur a/generic/tixDItem.c b/generic/tixDItem.c

     

       2
       2
       +
       --- a/generic/tixDItem.c	2004-03-27 19:44:56.000000000 -0700

     

       3
       3
       +
       +++ b/generic/tixDItem.c	2023-07-11 14:49:51.583894242 -0600

     

       4
       4
       +
       @@ -30,7 +30,7 @@

     

       5
       5
       +
        		Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value,

     

       6
       6
       +
        		char *widRec, int offset));

     

       7
       7
       +
        

     

       8
       8
       +
       -static char *DItemPrintProc _ANSI_ARGS_((

     

       9
       9
       +
       +static const char *DItemPrintProc _ANSI_ARGS_((

     

       10
       10
       +
        		ClientData clientData, Tk_Window tkwin, char *widRec,

     

       11
       11
       +
        		int offset, Tcl_FreeProc **freeProcPtr));

     

       12
       12
       +
        

     

       13
       13
       +
       @@ -548,7 +548,7 @@

     

       14
       14
       +
            return TCL_OK;

     

       15
       15
       +
        }

     

       16
       16
       +
        

     

       17
       17
       +
       -static char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)

     

       18
       18
       +
       +static const char *DItemPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)

     

       19
       19
       +
            ClientData clientData;

     

       20
       20
       +
            Tk_Window tkwin;

     

       21
       21
       +
            char *widRec;

     

       22
       22
       +
       diff -ur a/generic/tixDiStyle.c b/generic/tixDiStyle.c

     

       23
       23
       +
       --- a/generic/tixDiStyle.c	2004-03-27 19:44:56.000000000 -0700

     

       24
       24
       +
       +++ b/generic/tixDiStyle.c	2023-07-11 15:02:45.245210252 -0600

     

       25
       25
       +
       @@ -31,7 +31,7 @@

     

       26
       26
       +
        static int   		DItemStyleParseProc _ANSI_ARGS_((ClientData clientData,

     

       27
       27
       +
        			    Tcl_Interp *interp, Tk_Window tkwin,

     

       28
       28
       +
        			    CONST84 char *value,char *widRec, int offset));

     

       29
       29
       +
       -static char *		DItemStylePrintProc _ANSI_ARGS_((

     

       30
       30
       +
       +static const char *		DItemStylePrintProc _ANSI_ARGS_((

     

       31
       31
       +
        			    ClientData clientData, Tk_Window tkwin, 

     

       32
       32
       +
        			    char *widRec, int offset,

     

       33
       33
       +
        			    Tcl_FreeProc **freeProcPtr));

     

       34
       34
       +
       @@ -785,7 +785,7 @@

     

       35
       35
       +
        

     

       36
       36
       +
            hashPtr = Tcl_CreateHashEntry(&stylePtr->base.items, (char*)iPtr, &isNew);

     

       37
       37
       +
            if (!isNew) {

     

       38
       38
       +
       -	panic("DItem is already associated with style");

     

       39
       39
       +
       +	Tcl_Panic("DItem is already associated with style");

     

       40
       40
       +
            } else {

     

       41
       41
       +
        	Tcl_SetHashValue(hashPtr, (char*)iPtr);

     

       42
       42
       +
            }

     

       43
       43
       +
       @@ -801,7 +801,7 @@

     

       44
       44
       +
        

     

       45
       45
       +
            hashPtr = Tcl_FindHashEntry(&stylePtr->base.items, (char*)iPtr);

     

       46
       46
       +
            if (hashPtr == NULL) {

     

       47
       47
       +
       -	panic("DItem is not associated with style");

     

       48
       48
       +
       +	Tcl_Panic("DItem is not associated with style");

     

       49
       49
       +
            }

     

       50
       50
       +
            Tcl_DeleteHashEntry(hashPtr);

     

       51
       51
       +
            stylePtr->base.refCount--;

     

       52
       52
       +
       @@ -998,7 +998,7 @@

     

       53
       53
       +
            return TCL_ERROR;

     

       54
       54
       +
        }

     

       55
       55
       +
        

     

       56
       56
       +
       -static char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr)

     

       57
       57
       +
       +static const char *DItemStylePrintProc(clientData, tkwin, widRec,offset, freeProcPtr)

     

       58
       58
       +
            ClientData clientData;

     

       59
       59
       +
            Tk_Window tkwin;

     

       60
       60
       +
            char *widRec;

     

       61
       61
       +
       diff -ur a/generic/tixForm.c b/generic/tixForm.c

     

       62
       62
       +
       --- a/generic/tixForm.c	2004-03-27 19:44:56.000000000 -0700

     

       63
       63
       +
       +++ b/generic/tixForm.c	2023-07-11 14:53:45.695753419 -0600

     

       64
       64
       +
       @@ -802,7 +802,7 @@

     

       65
       65
       +
             * Now set all the client's geometry

     

       66
       66
       +
             */

     

       67
       67
       +
            if (PlaceAllClients(masterPtr) != TCL_OK) {

     

       68
       68
       +
       -	panic("circular dependency");

     

       69
       69
       +
       +	Tcl_Panic("circular dependency");

     

       70
       70
       +
            }

     

       71
       71
       +
        

     

       72
       72
       +
            for (clientPtr = masterPtr->client; clientPtr; clientPtr=clientPtr->next) {

     

       73
       73
       +
       diff -ur a/generic/tixGrData.c b/generic/tixGrData.c

     

       74
       74
       +
       --- a/generic/tixGrData.c	2004-03-27 19:44:56.000000000 -0700

     

       75
       75
       +
       +++ b/generic/tixGrData.c	2023-07-11 14:54:19.644741199 -0600

     

       76
       76
       +
       @@ -296,7 +296,7 @@

     

       77
       77
       +
        	Tcl_DeleteHashEntry(cy);

     

       78
       78
       +
            }

     

       79
       79
       +
            else {

     

       80
       80
       +
       -	panic("Inconsistent grid dataset: (%d,%d) : %x %x", x, y, cx, cy);

     

       81
       81
       +
       +	Tcl_Panic("Inconsistent grid dataset: (%d,%d) : %x %x", x, y, cx, cy);

     

       82
       82
       +
            }

     

       83
       83
       +
        

     

       84
       84
       +
            return 1;

     

       85
       85
       +
       diff -ur a/generic/tixGrid.c b/generic/tixGrid.c

     

       86
       86
       +
       --- a/generic/tixGrid.c	2008-02-27 21:10:43.000000000 -0700

     

       87
       87
       +
       +++ b/generic/tixGrid.c	2023-07-11 14:53:59.283841038 -0600

     

       88
       88
       +
       @@ -831,7 +831,7 @@

     

       89
       89
       +
        	 * All mapped windows should have been unmapped when the

     

       90
       90
       +
        	 * the entries were deleted

     

       91
       91
       +
        	 */

     

       92
       92
       +
       -	panic("tixGrid: mappedWindows not NULL");

     

       93
       93
       +
       +	Tcl_Panic("tixGrid: mappedWindows not NULL");

     

       94
       94
       +
            }

     

       95
       95
       +
        

     

       96
       96
       +
            Tk_FreeOptions(configSpecs, (char *) wPtr, wPtr->dispData.display, 0);

     

       97
       97
       +
       diff -ur a/generic/tixHList.c b/generic/tixHList.c

     

       98
       98
       +
       --- a/generic/tixHList.c	2008-02-27 21:05:29.000000000 -0700

     

       99
       99
       +
       +++ b/generic/tixHList.c	2023-07-11 14:55:20.699375202 -0600

     

       100
       100
       +
       @@ -2036,7 +2036,7 @@

     

       101
       101
       +
        	    break;

     

       102
       102
       +
        	}

     

       103
       103
       +
        	if (wPtr->headerWin != NULL) {

     

       104
       104
       +
       -	    panic("HList: header subwindow deleted illegally\n");

     

       105
       105
       +
       +	    Tcl_Panic("HList: header subwindow deleted illegally\n");

     

       106
       106
       +
        	}

     

       107
       107
       +
        #endif

     

       108
       108
       +
        	break;

     

       109
       109
       +
       @@ -2117,7 +2117,7 @@

     

       110
       110
       +
        	 * All mapped windows should have been unmapped when the

     

       111
       111
       +
        	 * the entries were deleted

     

       112
       112
       +
        	 */

     

       113
       113
       +
       -	panic("tixHList: mappedWindows not NULL");

     

       114
       114
       +
       +	Tcl_Panic("tixHList: mappedWindows not NULL");

     

       115
       115
       +
            }

     

       116
       116
       +
            if (wPtr->headerWin) {

     

       117
       117
       +
        	wPtr->headerWin = NULL;

     

       118
       118
       +
       diff -ur a/generic/tixImgCmp.c b/generic/tixImgCmp.c

     

       119
       119
       +
       --- a/generic/tixImgCmp.c	2008-02-27 21:05:29.000000000 -0700

     

       120
       120
       +
       +++ b/generic/tixImgCmp.c	2023-07-11 14:59:16.429640785 -0600

     

       121
       121
       +
       @@ -142,8 +142,8 @@

     

       122
       122
       +
         * The type record for bitmap images:

     

       123
       123
       +
         */

     

       124
       124
       +
        static int		ImgCmpCreate _ANSI_ARGS_((Tcl_Interp *interp,

     

       125
       125
       +
       -			    char *name, int argc, Tcl_Obj *CONST objv[],

     

       126
       126
       +
       -			    Tk_ImageType *typePtr, Tk_ImageMaster master,

     

       127
       127
       +
       +			    const char *name, int argc, Tcl_Obj *CONST objv[],

     

       128
       128
       +
       +			    const Tk_ImageType *typePtr, Tk_ImageMaster master,

     

       129
       129
       +
        			    ClientData *clientDataPtr));

     

       130
       130
       +
        static ClientData	ImgCmpGet _ANSI_ARGS_((Tk_Window tkwin,

     

       131
       131
       +
        			    ClientData clientData));

     

       132
       132
       +
       @@ -378,11 +378,11 @@

     

       133
       133
       +
        ImgCmpCreate(interp, name, argc, objv, typePtr, master, clientDataPtr)

     

       134
       134
       +
            Tcl_Interp *interp;		/* Interpreter for application containing

     

       135
       135
       +
        				 * image. */

     

       136
       136
       +
       -    char *name;			/* Name to use for image. */

     

       137
       137
       +
       +    const char *name;		/* Name to use for image. */

     

       138
       138
       +
            int argc;			/* Number of arguments. */

     

       139
       139
       +
            Tcl_Obj *CONST objv[];	/* Argument strings for options (doesn't

     

       140
       140
       +
        				 * include image name or type). */

     

       141
       141
       +
       -    Tk_ImageType *typePtr;	/* Pointer to our type record (not used). */

     

       142
       142
       +
       +    const Tk_ImageType *typePtr;/* Pointer to our type record (not used). */

     

       143
       143
       +
            Tk_ImageMaster master;	/* Token for image, to be used by us in

     

       144
       144
       +
        				 * later callbacks. */

     

       145
       145
       +
            ClientData *clientDataPtr;	/* Store manager's token for image here;

     

       146
       146
       +
       diff -ur a/generic/tixImgXpm.c b/generic/tixImgXpm.c

     

       147
       147
       +
       --- a/generic/tixImgXpm.c	2023-07-11 15:01:05.887387236 -0600

     

       148
       148
       +
       +++ b/generic/tixImgXpm.c	2023-07-11 15:00:37.209042328 -0600

     

       149
       149
       +
       @@ -22,8 +22,8 @@

     

       150
       150
       +
         */

     

       151
       151
       +
        

     

       152
       152
       +
        static int		ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,

     

       153
       153
       +
       -			    char *name, int argc, Tcl_Obj *CONST objv[],

     

       154
       154
       +
       -			    Tk_ImageType *typePtr, Tk_ImageMaster master,

     

       155
       155
       +
       +			    const char *name, int argc, Tcl_Obj *CONST objv[],

     

       156
       156
       +
       +			    const Tk_ImageType *typePtr, Tk_ImageMaster master,

     

       157
       157
       +
        			    ClientData *clientDataPtr));

     

       158
       158
       +
        static ClientData	ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,

     

       159
       159
       +
        			    ClientData clientData));

     

       160
       160
       +
       @@ -115,11 +115,11 @@

     

       161
       161
       +
        ImgXpmCreate(interp, name, argc, objv, typePtr, master, clientDataPtr)

     

       162
       162
       +
            Tcl_Interp *interp;		/* Interpreter for application containing

     

       163
       163
       +
        				 * image. */

     

       164
       164
       +
       -    char *name;			/* Name to use for image. */

     

       165
       165
       +
       +    const char *name;		/* Name to use for image. */

     

       166
       166
       +
            int argc;			/* Number of arguments. */

     

       167
       167
       +
            Tcl_Obj *CONST objv[];	/* Argument strings for options (doesn't

     

       168
       168
       +
        				 * include image name or type). */

     

       169
       169
       +
       -    Tk_ImageType *typePtr;	/* Pointer to our type record (not used). */

     

       170
       170
       +
       +    const Tk_ImageType *typePtr;/* Pointer to our type record (not used). */

     

       171
       171
       +
            Tk_ImageMaster master;	/* Token for image, to be used by us in

     

       172
       172
       +
        				 * later callbacks. */

     

       173
       173
       +
            ClientData *clientDataPtr;	/* Store manager's token for image here;

     

       174
       174
       +
       @@ -1213,7 +1213,7 @@

     

       175
       175
       +
            PixmapMaster *masterPtr = (PixmapMaster *) masterData;

     

       176
       176
       +
        

     

       177
       177
       +
            if (masterPtr->instancePtr != NULL) {

     

       178
       178
       +
       -	panic("tried to delete pixmap image when instances still exist");

     

       179
       179
       +
       +	Tcl_Panic("tried to delete pixmap image when instances still exist");

     

       180
       180
       +
            }

     

       181
       181
       +
            masterPtr->tkMaster = NULL;

     

       182
       182
       +
            if (masterPtr->imageCmd != NULL) {

     

       183
       183
       +
       diff -ur a/generic/tixTList.c b/generic/tixTList.c

     

       184
       184
       +
       --- a/generic/tixTList.c	2008-02-27 21:05:29.000000000 -0700

     

       185
       185
       +
       +++ b/generic/tixTList.c	2023-07-11 14:55:35.960761327 -0600

     

       186
       186
       +
       @@ -1208,7 +1208,7 @@

     

       187
       187
       +
        	    sprintf(buff, "%d", i);

     

       188
       188
       +
        	    Tcl_AppendResult(interp, buff, NULL);

     

       189
       189
       +
        	} else {

     

       190
       190
       +
       -	    panic("TList list entry is invalid");

     

       191
       191
       +
       +	    Tcl_Panic("TList list entry is invalid");

     

       192
       192
       +
        	}

     

       193
       193
       +
            } else {

     

       194
       194
       +
        	Tcl_ResetResult(interp);

     

       195
       195
       +
       diff -ur a/generic/tixUtils.c b/generic/tixUtils.c

     

       196
       196
       +
       --- a/generic/tixUtils.c	2008-02-27 21:29:17.000000000 -0700

     

       197
       197
       +
       +++ b/generic/tixUtils.c	2023-07-11 15:01:43.718202631 -0600

     

       198
       198
       +
       @@ -24,7 +24,7 @@

     

       199
       199
       +
        static int	ReliefParseProc(ClientData clientData,

     

       200
       200
       +
        	Tcl_Interp *interp, Tk_Window tkwin, CONST84 char *value,

     

       201
       201
       +
        	char *widRec, int offset);

     

       202
       202
       +
       -static char *	ReliefPrintProc(ClientData clientData,

     

       203
       203
       +
       +static const char *	ReliefPrintProc(ClientData clientData,

     

       204
       204
       +
        	Tk_Window tkwin, char *widRec, int offset,

     

       205
       205
       +
        	Tix_FreeProc **freeProcPtr);

     

       206
       206
       +
        

     

       207
       207
       +
       @@ -637,7 +637,7 @@

     

       208
       208
       +
            return TCL_ERROR;

     

       209
       209
       +
        }

     

       210
       210
       +
        

     

       211
       211
       +
       -static char *

     

       212
       212
       +
       +static const char *

     

       213
       213
       +
        ReliefPrintProc(clientData, tkwin, widRec,offset, freeProcPtr)

     

       214
       214
       +
            ClientData clientData;

     

       215
       215
       +
            Tk_Window tkwin;

+2 -2

pkgs/development/libraries/umockdev/default.nix

···

       20
       20
        
       

     

       21
       21
        
       stdenv.mkDerivation (finalAttrs: {

     

       22
       22
        
         pname = "umockdev";

     

       23
       23
       -
         version = "0.17.17";

     

       23
       23
       +
         version = "0.17.18";

     

       24
       24
        
       

     

       25
       25
        
         outputs = [ "bin" "out" "dev" "devdoc" ];

     

       26
       26
        
       

     

       27
       27
        
         src = fetchurl {

     

       28
       28
        
           url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz";

     

       29
       29
       -
           sha256 = "sha256-IOYhseRYsyADz+qZc5tngkuGZShUqLzjPiYSTjR/32w=";

     

       29
       29
       +
           sha256 = "sha256-RmrT4McV5W9Q6mqWUWWCPQc6hBN6y4oeObZlc2SKmF8=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         patches = [

+3 -6

pkgs/development/libraries/webp-pixbuf-loader/default.nix

···

       11
       11
        
       

     

       12
       12
        
       let

     

       13
       13
        
         inherit (gdk-pixbuf) moduleDir;

     

       14
       14
       -
       

     

       15
       15
       -
         # turning lib/gdk-pixbuf-#.#/#.#.#/loaders into lib/gdk-pixbuf-#.#/#.#.#/loaders.cache

     

       16
       16
       -
         # removeSuffix is just in case moduleDir gets a trailing slash

     

       17
       17
       -
         loadersPath = (lib.strings.removeSuffix "/" gdk-pixbuf.moduleDir) + ".cache";

     

       14
       14
       +
         loadersPath = "${gdk-pixbuf.binaryDir}/webp-loaders.cache";

     

       18
       15
        
       in

     

       19
       16
        
       stdenv.mkDerivation rec {

     

       20
       17
        
         pname = "webp-pixbuf-loader";

     
···

       47
       44
        
         postPatch = ''

     

       48
       45
        
           # It looks for gdk-pixbuf-thumbnailer in this package's bin rather than the gdk-pixbuf bin. We need to patch that.

     

       49
       46
        
           substituteInPlace webp-pixbuf.thumbnailer.in \

     

       50
       50
       -
             --replace "@bindir@/gdk-pixbuf-thumbnailer" "$out/bin/webp-thumbnailer"

     

       47
       47
       +
             --replace "@bindir@/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp"

     

       51
       48
        
         '';

     

       52
       49
        
       

     

       53
       50
        
         postInstall = ''

     
···

       58
       55
        
           # It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.

     

       59
       56
        
           # So we replace it with a wrapped executable.

     

       60
       57
        
           mkdir -p "$out/bin"

     

       61
       61
       -
           makeWrapper "${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer" "$out/bin/webp-thumbnailer" \

     

       58
       58
       +
           makeWrapper "${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer" "$out/libexec/gdk-pixbuf-thumbnailer-webp" \

     

       62
       59
        
             --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"

     

       63
       60
        
         '';

     

       64
       61

+2

pkgs/development/python-modules/adguardhome/default.nix

···

       42
       42
        
           yarl

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
       +
         __darwinAllowLocalNetworking = true;

     

       46
       46
       +
       

     

       45
       47
        
         nativeCheckInputs = [

     

       46
       48
        
           aresponses

     

       47
       49
        
           pytest-asyncio

+2

pkgs/development/python-modules/aio-geojson-client/default.nix

···

       31
       31
        
           haversine

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
       +
         __darwinAllowLocalNetworking = true;

     

       35
       35
       +
       

     

       34
       36
        
         nativeCheckInputs = [

     

       35
       37
        
           aresponses

     

       36
       38
        
           mock

+2

pkgs/development/python-modules/aio-geojson-generic-client/default.nix

···

       30
       30
        
           pytz

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       +
         __darwinAllowLocalNetworking = true;

     

       34
       34
       +
       

     

       33
       35
        
         nativeCheckInputs = [

     

       34
       36
        
           aresponses

     

       35
       37
        
           pytest-asyncio

+2

pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix

···

       30
       30
        
           pytz

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       +
         __darwinAllowLocalNetworking = true;

     

       34
       34
       +
       

     

       33
       35
        
         nativeCheckInputs = [

     

       34
       36
        
           aresponses

     

       35
       37
        
           pytest-asyncio

+2

pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix

···

       31
       31
        
           pytz

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
       +
         __darwinAllowLocalNetworking = true;

     

       35
       35
       +
       

     

       34
       36
        
         nativeCheckInputs = [

     

       35
       37
        
           aresponses

     

       36
       38
        
           mock

+2

pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix

···

       30
       30
        
           pytz

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       +
         __darwinAllowLocalNetworking = true;

     

       34
       34
       +
       

     

       33
       35
        
         nativeCheckInputs = [

     

       34
       36
        
           aresponses

     

       35
       37
        
           pytest-asyncio

+2

pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix

···

       30
       30
        
           pytz

     

       31
       31
        
         ];

     

       32
       32
        
       

     

       33
       33
       +
         __darwinAllowLocalNetworking = true;

     

       34
       34
       +
       

     

       33
       35
        
         nativeCheckInputs = [

     

       34
       36
        
           pytestCheckHook

     

       35
       37
        
         ];

+2

pkgs/development/python-modules/aio-georss-client/default.nix

···

       35
       35
        
           dateparser

     

       36
       36
        
         ];

     

       37
       37
        
       

     

       38
       38
       +
         __darwinAllowLocalNetworking = true;

     

       39
       39
       +
       

     

       38
       40
        
         nativeCheckInputs = [

     

       39
       41
        
           aresponses

     

       40
       42
        
           mock

+2

pkgs/development/python-modules/aio-georss-gdacs/default.nix

···

       28
       28
        
           dateparser

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
       +
         __darwinAllowLocalNetworking = true;

     

       32
       32
       +
       

     

       31
       33
        
         nativeCheckInputs = [

     

       32
       34
        
           aresponses

     

       33
       35
        
           pytest-asyncio

+2

pkgs/development/python-modules/aiohttp-retry/default.nix

···

       25
       25
        
           aiohttp

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       +
         __darwinAllowLocalNetworking = true;

     

       29
       29
       +
       

     

       28
       30
        
         nativeCheckInputs = [

     

       29
       31
        
           pytest-aiohttp

     

       30
       32
        
           pytestCheckHook

+4

pkgs/development/python-modules/aiohttp/default.nix

···

       6
       6
        
       , pythonOlder

     

       7
       7
        
       # build_requires

     

       8
       8
        
       , setuptools

     

       9
       9
       +
       , wheel

     

       9
       10
        
       # install_requires

     

       10
       11
        
       , attrs

     

       11
       12
        
       , charset-normalizer

     
···

       49
       50
        
             url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch";

     

       50
       51
        
             hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g=";

     

       51
       52
        
           })

     

       53
       53
       +
           # https://github.com/aio-libs/aiohttp/pull/7454 but does not merge cleanly

     

       54
       54
       +
           ./setuptools-67.5.0-compatibility.diff

     

       52
       55
        
         ];

     

       53
       56
        
       

     

       54
       57
        
         postPatch = ''

     
···

       57
       60
        
       

     

       58
       61
        
         nativeBuildInputs = [

     

       59
       62
        
           setuptools

     

       63
       63
       +
           wheel

     

       60
       64
        
         ];

     

       61
       65
        
       

     

       62
       66
        
         propagatedBuildInputs = [

+27

pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff

···

       1
       1
       +
       diff --git a/setup.cfg b/setup.cfg

     

       2
       2
       +
       index 6944b7e2..dfa65d69 100644

     

       3
       3
       +
       --- a/setup.cfg

     

       4
       4
       +
       +++ b/setup.cfg

     

       5
       5
       +
       @@ -128,6 +128,7 @@ filterwarnings =

     

       6
       6
       +
        	ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning::

     

       7
       7
       +
        	ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing

     

       8
       8
       +
        	ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core

     

       9
       9
       +
       +	ignore:pkg_resources is deprecated as an API:DeprecationWarning

     

       10
       10
       +
        junit_suite_name = aiohttp_test_suite

     

       11
       11
       +
        norecursedirs = dist docs build .tox .eggs

     

       12
       12
       +
        minversion = 3.8.2

     

       13
       13
       +
       diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py

     

       14
       14
       +
       index 22e5ea47..a655fd1d 100644

     

       15
       15
       +
       --- a/tests/test_circular_imports.py

     

       16
       16
       +
       +++ b/tests/test_circular_imports.py

     

       17
       17
       +
       @@ -113,6 +113,10 @@ def test_no_warnings(import_path: str) -> None:

     

       18
       18
       +
                "-W",

     

       19
       19
       +
                "ignore:Creating a LegacyVersion has been deprecated and will "

     

       20
       20
       +
                "be removed in the next major release:DeprecationWarning:",

     

       21
       21
       +
       +        # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing

     

       22
       22
       +
       +        # `gunicorn.util`.

     

       23
       23
       +
       +        "-W", "ignore:pkg_resources is deprecated as an API:"

     

       24
       24
       +
       +        "DeprecationWarning",

     

       25
       25
       +
                "-c", f"import {import_path!s}",

     

       26
       26
       +
                # fmt: on

     

       27
       27
       +
            )

+2

pkgs/development/python-modules/aiojobs/default.nix

···

       37
       37
        
           async-timeout

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
       +
         __darwinAllowLocalNetworking = true;

     

       41
       41
       +
       

     

       40
       42
        
         nativeCheckInputs = [

     

       41
       43
        
           pytestCheckHook

     

       42
       44
        
           pytest-aiohttp

+4

pkgs/development/python-modules/amqp/default.nix

···

       3
       3
        
       , case

     

       4
       4
        
       , fetchPypi

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
       +
       , pytest-rerunfailures

     

       6
       7
        
       , pythonOlder

     

       7
       8
        
       , vine

     

       8
       9
        
       }:

     
···

       23
       24
        
           vine

     

       24
       25
        
         ];

     

       25
       26
        
       

     

       27
       27
       +
         __darwinAllowLocalNetworking = true;

     

       28
       28
       +
       

     

       26
       29
        
         nativeCheckInputs = [

     

       27
       30
        
           case

     

       28
       31
        
           pytestCheckHook

     

       32
       32
       +
           pytest-rerunfailures

     

       29
       33
        
         ];

     

       30
       34
        
       

     

       31
       35
        
         disabledTests = [

+26 -6

pkgs/development/python-modules/ansi2html/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchpatch

     

       4
       4
       +
       , fetchPypi

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , setuptools

     

       7
       7
       +
       , setuptools-scm

     

       8
       8
       +
       , wheel

     

       9
       9
       +
       }:

     

       2
       10
        
       

     

       3
       11
        
       buildPythonPackage rec {

     

       4
       12
        
         pname = "ansi2html";

     

       5
       13
        
         version = "1.8.0";

     

       6
       14
        
         format = "pyproject";

     

       7
       7
       -
       

     

       8
       8
       -
         disabled = !isPy3k;

     

       9
       15
        
       

     

       10
       16
        
         src = fetchPypi {

     

       11
       17
        
           inherit pname version;

     

       12
       18
        
           hash = "sha256-OLgqKYSCofomE/D5yb6z23Ko+DLurFjrLke/Ms039tU=";

     

       13
       19
        
         };

     

       14
       20
        
       

     

       15
       15
       -
         nativeBuildInputs = [ setuptools-scm ];

     

       16
       16
       -
         propagatedBuildInputs = [ six setuptools ];

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           (fetchpatch {

     

       23
       23
       +
             name = "update-build-requirements.patch";

     

       24
       24
       +
             url = "https://github.com/pycontribs/ansi2html/commit/be9c47dd39e500b2e34e95efde90d0a3b44daaee.patch";

     

       25
       25
       +
             hash = "sha256-nvOclsgysg+4sK694ppls0BLfq5MCJJQW3V/Ru30D/k=";

     

       26
       26
       +
           })

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         nativeBuildInputs = [

     

       30
       30
       +
           setuptools

     

       31
       31
       +
           setuptools-scm

     

       32
       32
       +
           wheel

     

       33
       33
       +
         ];

     

       17
       34
        
       

     

       18
       35
        
         preCheck = "export PATH=$PATH:$out/bin";

     

       19
       19
       -
         nativeCheckInputs = [ mock pytestCheckHook ];

     

       36
       36
       +
       

     

       37
       37
       +
         nativeCheckInputs = [

     

       38
       38
       +
           pytestCheckHook

     

       39
       39
       +
         ];

     

       20
       40
        
       

     

       21
       41
        
         pythonImportsCheck = [ "ansi2html" ];

     

       22
       42

+2

pkgs/development/python-modules/asyncssh/default.nix

···

       58
       58
        
           ];

     

       59
       59
        
         };

     

       60
       60
        
       

     

       61
       61
       +
         __darwinAllowLocalNetworking = true;

     

       62
       62
       +
       

     

       61
       63
        
         nativeCheckInputs = [

     

       62
       64
        
           openssh

     

       63
       65
        
           openssl

+9 -3

pkgs/development/python-modules/bluetooth-data-tools/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , cython_3

     

       4
       5
        
       , poetry-core

     

       5
       6
        
       , pytestCheckHook

     

       6
       7
        
       , pythonOlder

     
···

       9
       10
        
       

     

       10
       11
        
       buildPythonPackage rec {

     

       11
       12
        
         pname = "bluetooth-data-tools";

     

       12
       12
       -
         version = "1.6.1";

     

       13
       13
       +
         version = "1.7.0";

     

       13
       14
        
         format = "pyproject";

     

       14
       15
        
       

     

       15
       16
        
         disabled = pythonOlder "3.9";

     
···

       18
       19
        
           owner = "Bluetooth-Devices";

     

       19
       20
        
           repo = pname;

     

       20
       21
        
           rev = "refs/tags/v${version}";

     

       21
       21
       -
           hash = "sha256-A3zdM2kVmz8cUix9JT8cnIABZK64r6yiZisvb8A1RSQ=";

     

       22
       22
       +
           hash = "sha256-EmZPiZKm/80nJpPnJWhI9i4I6MhgQMifLOEUBFLqbSw=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       25
       25
       +
         # The project can build both an optimized cython version and an unoptimized

     

       26
       26
       +
         # python version. This ensures we fail if we build the wrong one.

     

       27
       27
       +
         env.REQUIRE_CYTHON = 1;

     

       28
       28
       +
       

     

       24
       29
        
         nativeBuildInputs = [

     

       30
       30
       +
           cython_3

     

       25
       31
        
           poetry-core

     

       26
       32
        
           setuptools

     

       27
       33
        
         ];

     
···

       43
       49
        
           description = "Library for converting bluetooth data and packets";

     

       44
       50
        
           homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools";

     

       45
       51
        
           changelog = "https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v${version}/CHANGELOG.md";

     

       46
       46
       -
           license = with licenses; [ asl20 ];

     

       52
       52
       +
           license = licenses.asl20;

     

       47
       53
        
           maintainers = with maintainers; [ fab ];

     

       48
       54
        
         };

     

       49
       55
        
       }

+10 -7

pkgs/development/python-modules/curio/default.nix

···

       26
       26
        
         __darwinAllowLocalNetworking = true;

     

       27
       27
        
       

     

       28
       28
        
         disabledTests = [

     

       29
       29
       -
            "test_aside_basic" # times out

     

       30
       30
       -
            "test_write_timeout" # flaky, does not always time out

     

       31
       31
       -
            "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest

     

       32
       32
       -
            "test_ssl_outgoing" # touches network

     

       33
       33
       -
            "test_unix_echo" # socket bind error on hydra when built with other packages

     

       34
       34
       -
            "test_unix_ssl_server" # socket bind error on hydra when built with other packages

     

       35
       35
       -
          ];

     

       29
       29
       +
           "test_aside_basic" # times out

     

       30
       30
       +
           "test_write_timeout" # flaky, does not always time out

     

       31
       31
       +
           "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest

     

       32
       32
       +
           "test_ssl_outgoing" # touches network

     

       33
       33
       +
           "test_unix_echo" # socket bind error on hydra when built with other packages

     

       34
       34
       +
           "test_unix_ssl_server" # socket bind error on hydra when built with other packages

     

       35
       35
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       36
       36
       +
           # connects to python.org:1, expects an OsError, hangs in the darwin sandbox

     

       37
       37
       +
           "test_create_bad_connection"

     

       38
       38
       +
         ];

     

       36
       39
        
       

     

       37
       40
        
         pythonImportsCheck = [ "curio" ];

     

       38
       41

+2

pkgs/development/python-modules/datadog/default.nix

···

       34
       34
        
           requests

     

       35
       35
        
         ];

     

       36
       36
        
       

     

       37
       37
       +
         __darwinAllowLocalNetworking = true;

     

       38
       38
       +
       

     

       37
       39
        
         nativeCheckInputs = [

     

       38
       40
        
           click

     

       39
       41
        
           freezegun

+8

pkgs/development/python-modules/dbus-fast/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , async-timeout

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       +
       , cython_3

     

       4
       5
        
       , fetchFromGitHub

     

       5
       6
        
       , poetry-core

     

       6
       7
        
       , pytest-asyncio

     

       7
       8
        
       , pytestCheckHook

     

       8
       9
        
       , pythonOlder

     

       9
       10
        
       , setuptools

     

       11
       11
       +
       , wheel

     

       10
       12
        
       }:

     

       11
       13
        
       

     

       12
       14
        
       buildPythonPackage rec {

     
···

       23
       25
        
           hash = "sha256-B+NW7ORKIBtjxeR0W0tX7V1MgBtNoyGFX35TXUl7rVE=";

     

       24
       26
        
         };

     

       25
       27
        
       

     

       28
       28
       +
         # The project can build both an optimized cython version and an unoptimized

     

       29
       29
       +
         # python version. This ensures we fail if we build the wrong one.

     

       30
       30
       +
         env.REQUIRE_CYTHON = 1;

     

       31
       31
       +
       

     

       26
       32
        
         nativeBuildInputs = [

     

       33
       33
       +
           cython_3

     

       27
       34
        
           poetry-core

     

       28
       35
        
           setuptools

     

       36
       36
       +
           wheel

     

       29
       37
        
         ];

     

       30
       38
        
       

     

       31
       39
        
         propagatedBuildInputs = [

+2

pkgs/development/python-modules/devolo-plc-api/default.nix

···

       44
       44
        
           zeroconf

     

       45
       45
        
         ];

     

       46
       46
        
       

     

       47
       47
       +
         __darwinAllowLocalNetworking = true;

     

       48
       48
       +
       

     

       47
       49
        
         nativeCheckInputs = [

     

       48
       50
        
           pytest-asyncio

     

       49
       51
        
           pytest-httpx

+4 -2

pkgs/development/python-modules/django-cachalot/default.nix

···

       6
       6
        
       , psycopg2

     

       7
       7
        
       , beautifulsoup4

     

       8
       8
        
       , python

     

       9
       9
       +
       , pytz

     

       9
       10
        
       }:

     

       10
       11
        
       

     

       11
       12
        
       buildPythonPackage rec {

     

       12
       13
        
         pname = "django-cachalot";

     

       13
       13
       -
         version = "2.5.3";

     

       14
       14
       +
         version = "2.6.1";

     

       14
       15
        
         format = "setuptools";

     

       15
       16
        
       

     

       16
       17
        
         src = fetchFromGitHub {

     

       17
       18
        
           owner = "noripyt";

     

       18
       19
        
           repo = "django-cachalot";

     

       19
       20
        
           rev = "v${version}";

     

       20
       20
       -
           hash = "sha256-ayAN+PgK3aIpt4R8aeC6c6mRGTnfObycmkoXPTjx4WI=";

     

       21
       21
       +
           hash = "sha256-bCiIZkh02+7xL6aSWE9by+4dFDsanr0iXuO9QKpLOjw=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         patches = [

     
···

       34
       35
        
           beautifulsoup4

     

       35
       36
        
           django-debug-toolbar

     

       36
       37
        
           psycopg2

     

       38
       38
       +
           pytz

     

       37
       39
        
         ];

     

       38
       40
        
       

     

       39
       41
        
         pythonImportsCheck = [ "cachalot" ];

+2

pkgs/development/python-modules/django-cacheops/default.nix

···

       42
       42
        
           six

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
       +
         __darwinAllowLocalNetworking = true;

     

       46
       46
       +
       

     

       45
       47
        
         nativeCheckInputs = [

     

       46
       48
        
           pytestCheckHook

     

       47
       49
        
           pytest-django

-42

pkgs/development/python-modules/django-compat/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, python,

     

       2
       2
       -
         django, six

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "django-compat";

     

       7
       7
       -
         version = "1.0.15";

     

       8
       8
       -
       

     

       9
       9
       -
         # the pypi packages don't include everything required for the tests

     

       10
       10
       -
         src = fetchFromGitHub {

     

       11
       11
       -
           owner = "arteria";

     

       12
       12
       -
           repo = "django-compat";

     

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

     

       14
       14
       -
           sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp";

     

       15
       15
       -
         };

     

       16
       16
       -
       

     

       17
       17
       -
         patches = [

     

       18
       18
       -
           ./fix-tests.diff

     

       19
       19
       -
         ];

     

       20
       20
       -
       

     

       21
       21
       -
         checkPhase = ''

     

       22
       22
       -
           runHook preCheck

     

       23
       23
       -
       

     

       24
       24
       -
           # to convince the tests to run against the installed package, not the source directory, we extract the

     

       25
       25
       -
           # tests directory from it then dispose of the actual source

     

       26
       26
       -
           mv compat/tests .

     

       27
       27
       -
           rm -r compat

     

       28
       28
       -
           substituteInPlace runtests.py --replace compat.tests tests

     

       29
       29
       -
           ${python.interpreter} runtests.py

     

       30
       30
       -
       

     

       31
       31
       -
           runHook postCheck

     

       32
       32
       -
         '';

     

       33
       33
       -
       

     

       34
       34
       -
         propagatedBuildInputs = [ django six ];

     

       35
       35
       -
       

     

       36
       36
       -
         meta = with lib; {

     

       37
       37
       -
           description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11";

     

       38
       38
       -
           homepage = "https://github.com/arteria/django-compat";

     

       39
       39
       -
           license = licenses.mit;

     

       40
       40
       -
           maintainers = with maintainers; [ ris ];

     

       41
       41
       -
         };

     

       42
       42
       -
       }

-56

pkgs/development/python-modules/django-compat/fix-tests.diff

···

       1
       1
       -
       diff -ur a/compat/tests/settings.py b/compat/tests/settings.py

     

       2
       2
       -
       --- a/compat/tests/settings.py	2020-03-06 15:32:07.548482597 +0100

     

       3
       3
       -
       +++ b/compat/tests/settings.py	2020-03-06 22:19:25.422934249 +0100

     

       4
       4
       -
       @@ -16,11 +16,12 @@

     

       5
       5
       -
            'django.contrib.admin',

     

       6
       6
       -
            'django.contrib.auth',

     

       7
       7
       -
            'django.contrib.contenttypes',

     

       8
       8
       -
       +    'django.contrib.messages',

     

       9
       9
       -
            'compat',

     

       10
       10
       -
            'compat.tests.test_app',

     

       11
       11
       -
        ]

     

       12
       12
       -
        

     

       13
       13
       -
       -MIDDLEWARE_CLASSES = (

     

       14
       14
       -
       +MIDDLEWARE = (

     

       15
       15
       -
            'django.contrib.sessions.middleware.SessionMiddleware',

     

       16
       16
       -
            'django.middleware.common.CommonMiddleware',

     

       17
       17
       -
            'django.middleware.csrf.CsrfViewMiddleware',

     

       18
       18
       -
       @@ -43,6 +44,7 @@

     

       19
       19
       -
                        'django.template.context_processors.i18n',

     

       20
       20
       -
                        'django.template.context_processors.tz',

     

       21
       21
       -
                        'django.template.context_processors.request',

     

       22
       22
       -
       +                'django.contrib.messages.context_processors.messages',

     

       23
       23
       -
                    ],

     

       24
       24
       -
                    'loaders': [

     

       25
       25
       -
                        'django.template.loaders.filesystem.Loader',

     

       26
       26
       -
       diff -ur a/compat/tests/test_compat.py b/compat/tests/test_compat.py

     

       27
       27
       -
       --- a/compat/tests/test_compat.py	2020-03-06 15:32:07.548482597 +0100

     

       28
       28
       -
       +++ b/compat/tests/test_compat.py	2020-03-06 15:37:39.202835075 +0100

     

       29
       29
       -
       @@ -9,7 +9,7 @@

     

       30
       30
       -
        from django.core.serializers.json import DjangoJSONEncoder

     

       31
       31
       -
        from django.test import TestCase, SimpleTestCase

     

       32
       32
       -
        from django.test.client import RequestFactory

     

       33
       33
       -
       -from django.contrib.auth.views import logout

     

       34
       34
       -
       +from django.contrib.auth.views import auth_logout

     

       35
       35
       -
        try:

     

       36
       36
       -
            from django.urls import NoReverseMatch

     

       37
       37
       -
        except ImportError:

     

       38
       38
       -
       @@ -103,7 +103,7 @@

     

       39
       39
       -
                Tests that passing a view name to ``resolve_url`` will result in the

     

       40
       40
       -
                URL path mapping to that view name.

     

       41
       41
       -
                """

     

       42
       42
       -
       -        resolved_url = resolve_url(logout)

     

       43
       43
       -
       +        resolved_url = resolve_url(auth_logout)

     

       44
       44
       -
                self.assertEqual('/accounts/logout/', resolved_url)

     

       45
       45
       -
        

     

       46
       46
       -
            '''

     

       47
       47
       -
       diff -ur a/compat/tests/urls.py b/compat/tests/urls.py

     

       48
       48
       -
       --- a/compat/tests/urls.py	2020-03-06 15:32:07.548482597 +0100

     

       49
       49
       -
       +++ b/compat/tests/urls.py	2020-03-06 15:34:25.962377799 +0100

     

       50
       50
       -
       @@ -2,5 +2,5 @@

     

       51
       51
       -
        from django.contrib.auth import views

     

       52
       52
       -
        

     

       53
       53
       -
        urlpatterns = [

     

       54
       54
       -
       -    url(r'^accounts/logout/$', views.logout, name='logout'),

     

       55
       55
       -
       +    url(r'^accounts/logout/$', views.auth_logout, name='logout'),

     

       56
       56
       -
        ]

+22 -3

pkgs/development/python-modules/django-haystack/default.nix

···

       4
       4
        
       , fetchPypi

     

       5
       5
        
       

     

       6
       6
        
       # build dependencies

     

       7
       7
       +
       , setuptools

     

       7
       8
        
       , setuptools-scm

     

       8
       9
        
       

     

       9
       10
        
       # dependencies

     

       10
       11
        
       , django

     

       11
       12
        
       

     

       12
       13
        
       # tests

     

       14
       14
       +
       , elasticsearch

     

       13
       15
        
       , geopy

     

       14
       16
        
       , nose

     

       15
       17
        
       , pysolr

     
···

       21
       23
        
       buildPythonPackage rec {

     

       22
       24
        
         pname = "django-haystack";

     

       23
       25
        
         version = "3.2.1";

     

       24
       24
       -
         format = "setuptools";

     

       26
       26
       +
         format = "pyproject";

     

       27
       27
       +
       

     

       25
       28
        
         disabled = pythonOlder "3.5";

     

       26
       29
        
       

     

       27
       30
        
         src = fetchPypi {

     
···

       35
       38
        
         '';

     

       36
       39
        
       

     

       37
       40
        
         nativeBuildInputs = [

     

       41
       41
       +
           setuptools

     

       38
       42
        
           setuptools-scm

     

       39
       43
        
         ];

     

       40
       44
        
       

     

       41
       41
       -
         propagatedBuildInputs = [

     

       45
       45
       +
         buildInputs = [

     

       42
       46
        
           django

     

       43
       47
        
         ];

     

       44
       48
        
       

     

       49
       49
       +
         passthru.optional-dependencies = {

     

       50
       50
       +
           elasticsearch = [

     

       51
       51
       +
             elasticsearch

     

       52
       52
       +
           ];

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
         doCheck = lib.versionOlder django.version "4";

     

       56
       56
       +
       

     

       45
       57
        
         nativeCheckInputs = [

     

       46
       58
        
           geopy

     

       47
       59
        
           nose

     
···

       49
       61
        
           python-dateutil

     

       50
       62
        
           requests

     

       51
       63
        
           whoosh

     

       52
       52
       -
         ];

     

       64
       64
       +
         ]

     

       65
       65
       +
         ++ passthru.optional-dependencies.elasticsearch;

     

       66
       66
       +
       

     

       67
       67
       +
         checkPhase = ''

     

       68
       68
       +
           runHook preCheck

     

       69
       69
       +
           python test_haystack/run_tests.py

     

       70
       70
       +
           runHook postCheck

     

       71
       71
       +
         '';

     

       53
       72
        
       

     

       54
       73
        
         meta = with lib; {

     

       55
       74
        
           description = "Pluggable search for Django";

-2

pkgs/development/python-modules/django-hijack/default.nix

···

       11
       11
        
       

     

       12
       12
        
       # dependencies

     

       13
       13
        
       , django

     

       14
       14
       -
       , django-compat

     

       15
       14
        
       

     

       16
       15
        
       # tests

     

       17
       16
        
       , pytest-django

     
···

       54
       53
        
       

     

       55
       54
        
         propagatedBuildInputs = [

     

       56
       55
        
           django

     

       57
       57
       -
           django-compat

     

       58
       56
        
         ];

     

       59
       57
        
       

     

       60
       58
        
         nativeCheckInputs = [

+32 -9

pkgs/development/python-modules/django-mailman3/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, django-gravatar2, django-compressor

     

       2
       2
       -
       , django-allauth, mailmanclient, django, mock

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       

     

       5
       5
       +
       # propagates

     

       6
       6
       +
       , django-gravatar2

     

       7
       7
       +
       , django-allauth

     

       8
       8
       +
       , mailmanclient

     

       9
       9
       +
       , pytz

     

       10
       10
       +
       

     

       11
       11
       +
       # tests

     

       12
       12
       +
       , django

     

       13
       13
       +
       , pytest-django

     

       14
       14
       +
       , pytestCheckHook

     

       3
       15
        
       }:

     

       4
       16
        
       

     

       5
       17
        
       buildPythonPackage rec {

     

       6
       18
        
         pname = "django-mailman3";

     

       7
       19
        
         version = "1.3.9";

     

       20
       20
       +
         format = "setuptools";

     

       8
       21
        
       

     

       9
       22
        
         src = fetchPypi {

     

       10
       23
        
           inherit pname version;

     

       11
       24
        
           hash = "sha256-GpI1W0O9aJpLF/mcS23ktJDZsP69S2zQy7drOiWBnTM=";

     

       12
       25
        
         };

     

       13
       26
        
       

     

       27
       27
       +
         postPatch = ''

     

       28
       28
       +
           substituteInPlace setup.py \

     

       29
       29
       +
             --replace 'django>=3.2,<4.2' 'django>=3.2,<4.3'

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       14
       32
        
         propagatedBuildInputs = [

     

       15
       15
       -
           django-gravatar2 django-compressor django-allauth mailmanclient

     

       33
       33
       +
           django-allauth

     

       34
       34
       +
           django-gravatar2

     

       35
       35
       +
           mailmanclient

     

       36
       36
       +
           pytz

     

       16
       37
        
         ];

     

       17
       17
       -
         nativeCheckInputs = [ django mock ];

     

       18
       38
        
       

     

       19
       19
       -
         checkPhase = ''

     

       20
       20
       -
           cd $NIX_BUILD_TOP/$sourceRoot

     

       21
       21
       -
           PYTHONPATH=.:$PYTHONPATH django-admin.py test --settings=django_mailman3.tests.settings_test

     

       22
       22
       -
         '';

     

       39
       39
       +
         nativeCheckInputs = [

     

       40
       40
       +
           django

     

       41
       41
       +
           pytest-django

     

       42
       42
       +
           pytestCheckHook

     

       43
       43
       +
         ];

     

       23
       44
        
       

     

       24
       24
       -
         pythonImportsCheck = [ "django_mailman3" ];

     

       45
       45
       +
         pythonImportsCheck = [

     

       46
       46
       +
           "django_mailman3"

     

       47
       47
       +
         ];

     

       25
       48
        
       

     

       26
       49
        
         meta = with lib; {

     

       27
       50
        
           description = "Django library for Mailman UIs";

+22 -11

pkgs/development/python-modules/django-modelcluster/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       

     

       6
       6
       +
       # dependencies

     

       4
       7
        
       , django

     

       8
       8
       +
       , pytz

     

       9
       9
       +
       

     

       10
       10
       +
       # optionals

     

       5
       11
        
       , django-taggit

     

       6
       6
       -
       , pytz

     

       7
       7
       -
       , pythonOlder

     

       8
       8
       -
       , python

     

       12
       12
       +
       

     

       13
       13
       +
       # tests

     

       14
       14
       +
       , pytest-django

     

       15
       15
       +
       , pytestCheckHook

     

       9
       16
        
       }:

     

       10
       17
        
       

     

       11
       18
        
       buildPythonPackage rec {

     
···

       17
       24
        
       

     

       18
       25
        
         src = fetchFromGitHub {

     

       19
       26
        
           owner = "wagtail";

     

       20
       20
       -
           repo = pname;

     

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

     

       27
       27
       +
           repo = "modelcluster";

     

       28
       28
       +
           rev = "refs/tags/v${version}";

     

       22
       29
        
           hash = "sha256-p6hvOkPWRVJYLHvwyn9nS05wblikRFmlSYZuLiCcuqc=";

     

       23
       30
        
         };

     

       24
       31
        
       

     
···

       31
       38
        
           django-taggit

     

       32
       39
        
         ];

     

       33
       40
        
       

     

       34
       34
       -
         nativeCheckInputs = passthru.optional-dependencies.taggit;

     

       41
       41
       +
         env.DJANGO_SETTINGS_MODULE = "tests.settings";

     

       35
       42
        
       

     

       36
       36
       -
         checkPhase = ''

     

       37
       37
       -
           runHook preCheck

     

       38
       38
       -
           ${python.interpreter} ./runtests.py --noinput

     

       39
       39
       -
           runHook postCheck

     

       40
       40
       -
         '';

     

       43
       43
       +
         nativeCheckInputs = [

     

       44
       44
       +
           pytest-django

     

       45
       45
       +
           pytestCheckHook

     

       46
       46
       +
         ] ++ passthru.optional-dependencies.taggit;

     

       47
       47
       +
       

     

       48
       48
       +
         # https://github.com/wagtail/django-modelcluster/issues/173

     

       49
       49
       +
         disabledTests = lib.optionals (lib.versionAtLeast django.version "4.2") [

     

       50
       50
       +
           "test_formfield_callback"

     

       51
       51
       +
         ];

     

       41
       52
        
       

     

       42
       53
        
         meta = with lib; {

     

       43
       54
        
           description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";

+2

pkgs/development/python-modules/django-pattern-library/default.nix

···

       51
       51
        
           changelog = "https://github.com/torchbox/django-pattern-library/blob/v${version}/CHANGELOG.md";

     

       52
       52
        
           license = licenses.bsd3;

     

       53
       53
        
           maintainers = with maintainers; [ sephi ];

     

       54
       54
       +
           # https://github.com/torchbox/django-pattern-library/issues/212

     

       55
       55
       +
           broken = lib.versionAtLeast django.version "4.2";

     

       54
       56
        
         };

     

       55
       57
        
       }

+20 -11

pkgs/development/python-modules/django-scim2/default.nix

···

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       

     

       5
       5
       +
       # build-system

     

       6
       6
       +
       , poetry-core

     

       7
       7
       +
       

     

       5
       8
        
       # propagates

     

       6
       9
        
       , django

     

       7
       7
       -
       , python-dateutil

     

       8
       10
        
       , scim2-filter-parser

     

       9
       9
       -
       , gssapi

     

       10
       10
       -
       , python-ldap

     

       11
       11
       -
       , sssd

     

       12
       11
        
       

     

       13
       12
        
       # tests

     

       14
       13
        
       , mock

     

       14
       14
       +
       , pytest-django

     

       15
       15
       +
       , pytestCheckHook

     

       15
       16
        
       }:

     

       16
       17
        
       

     

       17
       18
        
       buildPythonPackage rec {

     

       18
       19
        
         pname = "django-scim2";

     

       19
       19
       -
         version = "0.17.3";

     

       20
       20
       -
         format = "setuptools";

     

       20
       20
       +
         version = "0.19.0";

     

       21
       21
       +
         format = "pyproject";

     

       21
       22
        
       

     

       22
       23
        
         src = fetchFromGitHub {

     

       23
       24
        
           owner = "15five";

     

       24
       25
        
           repo = pname;

     

       25
       26
        
           rev = "refs/tags/${version}";

     

       26
       26
       -
           hash = "sha256-5zdGPpjooiFoj+2OoglXhhKsPFB/KOHvrZWZd+1nZqU=";

     

       27
       27
       +
           hash = "sha256-larDh4f9/xVr11/n/WfkJ2Tx45DMQqyK3ZzkWAvzeig=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       30
       30
       +
         postPatch = ''

     

       31
       31
       +
           substituteInPlace pyproject.toml \

     

       32
       32
       +
             --replace "poetry.masonry.api" "poetry.core.masonry.api"

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         nativeBuildInputs = [

     

       36
       36
       +
           poetry-core

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       29
       39
        
         propagatedBuildInputs = [

     

       30
       40
        
           django

     

       31
       31
       -
           python-dateutil

     

       32
       41
        
           scim2-filter-parser

     

       33
       33
       -
           gssapi

     

       34
       34
       -
           python-ldap

     

       35
       35
       -
           sssd

     

       36
       42
        
         ];

     

       37
       43
        
       

     

       38
       44
        
         pythonImportsCheck = [

     
···

       41
       47
        
       

     

       42
       48
        
         nativeCheckInputs = [

     

       43
       49
        
           mock

     

       50
       50
       +
           pytest-django

     

       51
       51
       +
           pytestCheckHook

     

       44
       52
        
         ];

     

       45
       53
        
       

     

       46
       54
        
         meta = with lib; {

     

       55
       55
       +
           changelog = "https://github.com/15five/django-scim2/blob/${src.rev}/CHANGES.txt";

     

       47
       56
        
           description = "A SCIM 2.0 Service Provider Implementation (for Django)";

     

       48
       57
        
           homepage = "https://github.com/15five/django-scim2";

     

       49
       58
        
           license = licenses.mit;

+2

pkgs/development/python-modules/django-sites/default.nix

···

       37
       37
        
           description = "Alternative implementation of django sites framework";

     

       38
       38
        
           homepage = "https://github.com/niwinz/django-sites";

     

       39
       39
        
           license = lib.licenses.bsd3;

     

       40
       40
       +
           # has not been updated for django>=4.0

     

       41
       41
       +
           broken = lib.versionAtLeast django.version "4";

     

       40
       42
        
         };

     

       41
       43
        
       }

+3

pkgs/development/python-modules/djangorestframework-guardian/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , django

     

       4
       5
        
       , django-guardian

     

       5
       6
        
       , djangorestframework

     

       6
       7
        
       }:

     
···

       37
       38
        
           homepage = "https://github.com/rpkilby/django-rest-framework-guardian";

     

       38
       39
        
           license = licenses.bsd3;

     

       39
       40
        
           maintainers = with maintainers; [ ];

     

       41
       41
       +
           # unmaintained, last compatible version is 3.x, use djangorestframework-guardian2 instead

     

       42
       42
       +
           broken = lib.versionAtLeast django.version "4";

     

       40
       43
        
         };

     

       41
       44
        
       }

+32 -10

pkgs/development/python-modules/drf-nested-routers/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , setuptools

     

       4
       4
       +
       , fetchpatch

     

       5
       5
        
       , django

     

       6
       6
        
       , djangorestframework

     

       7
       7
       -
       , pytest

     

       8
       8
       -
       , pytest-cov

     

       7
       7
       +
       , pytestCheckHook

     

       9
       8
        
       , pytest-django

     

       10
       9
        
       , ipdb

     

       11
       11
       -
       , python

     

       12
       10
        
       }:

     

       13
       11
        
       

     

       14
       12
        
       buildPythonPackage rec {

     

       15
       13
        
         pname = "drf-nested-routers";

     

       16
       14
        
         version = "0.93.4";

     

       15
       15
       +
         format = "setuptools";

     

       17
       16
        
       

     

       18
       17
        
         src = fetchFromGitHub {

     

       19
       18
        
           owner = "alanjds";

     

       20
       19
        
           repo = "drf-nested-routers";

     

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

     

       20
       20
       +
           rev = "refs/tags/v${version}";

     

       22
       21
        
           hash = "sha256-qlXNDydoQJ9FZB6G7yV/pNmx3BEo+lvRqsfjrvlbdNY=";

     

       23
       22
        
         };

     

       24
       23
        
       

     

       25
       25
       -
         propagatedBuildInputs = [ django djangorestframework setuptools ];

     

       26
       26
       -
         nativeCheckInputs = [ pytest pytest-cov pytest-django ipdb ];

     

       24
       24
       +
         patches = [

     

       25
       25
       +
           # django4 compatibility

     

       26
       26
       +
           (fetchpatch {

     

       27
       27
       +
             url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.patch";

     

       28
       28
       +
             hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";

     

       29
       29
       +
           })

     

       30
       30
       +
           (fetchpatch {

     

       31
       31
       +
             url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.patch";

     

       32
       32
       +
             hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";

     

       33
       33
       +
           })

     

       34
       34
       +
           (fetchpatch {

     

       35
       35
       +
             url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.patch";

     

       36
       36
       +
             hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";

     

       37
       37
       +
           })

     

       38
       38
       +
         ];

     

       27
       39
        
       

     

       28
       28
       -
         checkPhase = ''

     

       29
       29
       -
           ${python.interpreter} runtests.py --nolint

     

       30
       30
       -
         '';

     

       40
       40
       +
         buildInputs = [

     

       41
       41
       +
           django

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       44
       44
       +
         propagatedBuildInputs = [

     

       45
       45
       +
           djangorestframework

     

       46
       46
       +
         ];

     

       47
       47
       +
       

     

       48
       48
       +
         nativeCheckInputs = [

     

       49
       49
       +
           ipdb

     

       50
       50
       +
           pytestCheckHook

     

       51
       51
       +
           pytest-django

     

       52
       52
       +
         ];

     

       31
       53
        
       

     

       32
       54
        
         meta = with lib; {

     

       33
       55
        
           homepage = "https://github.com/alanjds/drf-nested-routers";

+2

pkgs/development/python-modules/falcon/default.nix

···

       45
       45
        
           cython

     

       46
       46
        
         ];

     

       47
       47
        
       

     

       48
       48
       +
         __darwinAllowLocalNetworking = true;

     

       49
       49
       +
       

     

       48
       50
        
         preCheck = ''

     

       49
       51
        
           export HOME=$TMPDIR

     

       50
       52
        
           cp -R tests examples $TMPDIR

+2

pkgs/development/python-modules/feedparser/default.nix

···

       22
       22
        
           sgmllib3k

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       +
         __darwinAllowLocalNetworking = true;

     

       26
       26
       +
       

     

       25
       27
        
         checkPhase = ''

     

       26
       28
        
           # Tests are failing

     

       27
       29
        
           # AssertionError: unexpected '~' char in declaration

+55

pkgs/development/python-modules/ffmpy/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , go

     

       7
       7
       +
       , ffmpeg-headless

     

       8
       8
       +
       }:

     

       9
       9
       +
       

     

       10
       10
       +
       buildPythonPackage rec {

     

       11
       11
       +
         pname = "ffmpy";

     

       12
       12
       +
         version = "0.3.1";

     

       13
       13
       +
         format = "setuptools";

     

       14
       14
       +
       

     

       15
       15
       +
         disabled = pythonOlder "3.6";

     

       16
       16
       +
       

     

       17
       17
       +
         src = fetchFromGitHub {

     

       18
       18
       +
           owner = "Ch00k";

     

       19
       19
       +
           repo = "ffmpy";

     

       20
       20
       +
           rev = "refs/tags/${version}";

     

       21
       21
       +
           hash = "sha256-kuLhmCG80BmXdqpW67UanBnuYiL2Oh1jKt7IgmVNEAM=";

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         postPatch = ''

     

       25
       25
       +
           # default to store ffmpeg

     

       26
       26
       +
           substituteInPlace ffmpy.py \

     

       27
       27
       +
             --replace 'executable="ffmpeg",' 'executable="${ffmpeg-headless}/bin/ffmpeg",'

     

       28
       28
       +
       

     

       29
       29
       +
           #  The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail.

     

       30
       30
       +
           for fname in tests/*.py; do

     

       31
       31
       +
             echo 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])' >>"$fname"

     

       32
       32
       +
           done

     

       33
       33
       +
         '';

     

       34
       34
       +
       

     

       35
       35
       +
         pythonImportsCheck = [ "ffmpy" ];

     

       36
       36
       +
       

     

       37
       37
       +
         nativeCheckInputs = [

     

       38
       38
       +
           pytestCheckHook

     

       39
       39
       +
           go

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         # the vendored ffmpeg mock binary assumes FHS

     

       43
       43
       +
         preCheck = ''

     

       44
       44
       +
           rm -v tests/ffmpeg/ffmpeg

     

       45
       45
       +
           HOME=$(mktemp -d) go build -o ffmpeg tests/ffmpeg/ffmpeg.go

     

       46
       46
       +
           export PATH=".:$PATH"

     

       47
       47
       +
         '';

     

       48
       48
       +
       

     

       49
       49
       +
         meta = with lib; {

     

       50
       50
       +
           description = "A simple python interface for FFmpeg/FFprobe";

     

       51
       51
       +
           homepage = "https://github.com/Ch00k/ffmpy";

     

       52
       52
       +
           license = licenses.mit;

     

       53
       53
       +
           maintainers = with maintainers; [ pbsds ];

     

       54
       54
       +
         };

     

       55
       55
       +
       }

+2 -16

pkgs/development/python-modules/flit-core/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , callPackage

     

       4
       3
        
       , flit

     

       5
       4
        
       }:

     

       6
       5
        
       

     
···

       9
       8
        
         inherit (flit) version;

     

       10
       9
        
         format = "pyproject";

     

       11
       10
        
       

     

       12
       12
       -
         outputs = [

     

       13
       13
       -
           "out"

     

       14
       14
       -
           "testsout"

     

       15
       15
       -
         ];

     

       16
       16
       -
       

     

       17
       11
        
         inherit (flit) src patches;

     

       18
       12
        
       

     

       19
       19
       -
         preConfigure = ''

     

       20
       20
       -
           cd flit_core

     

       21
       21
       -
         '';

     

       13
       13
       +
         sourceRoot = "source/flit_core";

     

       22
       14
        
       

     

       23
       23
       -
         postInstall = ''

     

       24
       24
       -
           mkdir $testsout

     

       25
       25
       -
           cp -R ../tests $testsout/tests

     

       26
       26
       -
         '';

     

       27
       27
       -
       

     

       28
       28
       -
         # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm

     

       15
       15
       +
         # Tests are run in the "flit" package.

     

       29
       16
        
         doCheck = false;

     

       30
       17
        
       

     

       31
       18
        
         passthru.tests = {

     

       32
       19
        
           inherit flit;

     

       33
       33
       -
           pytest = callPackage ./tests.nix { };

     

       34
       20
        
         };

     

       35
       21
        
       

     

       36
       22
        
         meta = with lib; {

-22

pkgs/development/python-modules/flit-core/tests.nix

···

       1
       1
       -
       { buildPythonPackage

     

       2
       2
       -
       , flit

     

       3
       3
       -
       , flit-core

     

       4
       4
       -
       , pytestCheckHook

     

       5
       5
       -
       , testpath

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       buildPythonPackage {

     

       9
       9
       -
         pname = "flit-core";

     

       10
       10
       -
         inherit (flit-core) version;

     

       11
       11
       -
       

     

       12
       12
       -
         src = flit-core.testsout;

     

       13
       13
       -
       

     

       14
       14
       -
         dontBuild = true;

     

       15
       15
       -
         dontInstall = true;

     

       16
       16
       -
       

     

       17
       17
       -
         nativeCheckInputs = [

     

       18
       18
       -
           flit

     

       19
       19
       -
           pytestCheckHook

     

       20
       20
       -
           testpath

     

       21
       21
       -
         ];

     

       22
       22
       -
       }

+2

pkgs/development/python-modules/google-auth-httplib2/default.nix

···

       27
       27
        
           httplib2

     

       28
       28
        
         ];

     

       29
       29
        
       

     

       30
       30
       +
         __darwinAllowLocalNetworking = true;

     

       31
       31
       +
       

     

       30
       32
        
         nativeCheckInputs = [

     

       31
       33
        
           flask

     

       32
       34
        
           mock

+57

pkgs/development/python-modules/gradio/conftest-skip-network-errors.py

···

       1
       1
       +
       # This is a pytest hook that skips tests that tries to access the network.

     

       2
       2
       +
       # These tests will immediately fail, then get marked as "Expected fail" (xfail).

     

       3
       3
       +
       

     

       4
       4
       +
       from _pytest.runner import pytest_runtest_makereport as orig_pytest_runtest_makereport

     

       5
       5
       +
       

     

       6
       6
       +
       # We use BaseException to minimize the chance it gets caught and 'pass'ed

     

       7
       7
       +
       class NixNetworkAccessDeniedError(BaseException):

     

       8
       8
       +
           pass

     

       9
       9
       +
       

     

       10
       10
       +
       def pytest_runtest_makereport(item, call):

     

       11
       11
       +
           """

     

       12
       12
       +
           Modifies test results after-the-fact. The function name is magic, see:

     

       13
       13
       +
           https://docs.pytest.org/en/7.1.x/reference/reference.html?highlight=pytest_runtest_makereport#std-hook-pytest_runtest_makereport

     

       14
       14
       +
           """

     

       15
       15
       +
       

     

       16
       16
       +
           def iterate_exc_chain(exc: Exception):

     

       17
       17
       +
               """

     

       18
       18
       +
               Recurses through exception chain, yielding all exceptions

     

       19
       19
       +
               """

     

       20
       20
       +
               yield exc

     

       21
       21
       +
               if getattr(exc, "__context__", None) is not None:

     

       22
       22
       +
                   yield from iterate_exc_chain(exc.__context__)

     

       23
       23
       +
               if getattr(exc, "__cause__", None) is not None:

     

       24
       24
       +
                   yield from iterate_exc_chain(exc.__cause__)

     

       25
       25
       +
       

     

       26
       26
       +
           tr = orig_pytest_runtest_makereport(item, call)

     

       27
       27
       +
           if call.excinfo is not None:

     

       28
       28
       +
               for exc in iterate_exc_chain(call.excinfo.value):

     

       29
       29
       +
                   if isinstance(exc, NixNetworkAccessDeniedError):

     

       30
       30
       +
                       tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access."

     

       31
       31
       +
                   if isinstance(exc, FileNotFoundError):  # gradio specific

     

       32
       32
       +
                       tr.outcome, tr.wasxfail = 'skipped', "reason: Pypi dist bad."

     

       33
       33
       +
           return tr

     

       34
       34
       +
       

     

       35
       35
       +
       # replace network access with exception

     

       36
       36
       +
       

     

       37
       37
       +
       def deny_network_access(*a, **kw):

     

       38
       38
       +
           raise NixNetworkAccessDeniedError

     

       39
       39
       +
       

     

       40
       40
       +
       import httpx

     

       41
       41
       +
       import requests

     

       42
       42
       +
       import socket

     

       43
       43
       +
       import urllib

     

       44
       44
       +
       import urllib3

     

       45
       45
       +
       import websockets

     

       46
       46
       +
       

     

       47
       47
       +
       httpx.AsyncClient.get = deny_network_access

     

       48
       48
       +
       httpx.AsyncClient.head = deny_network_access

     

       49
       49
       +
       httpx.Request = deny_network_access

     

       50
       50
       +
       requests.get = deny_network_access

     

       51
       51
       +
       requests.head = deny_network_access

     

       52
       52
       +
       requests.post = deny_network_access

     

       53
       53
       +
       socket.socket.connect = deny_network_access

     

       54
       54
       +
       urllib.request.Request = deny_network_access

     

       55
       55
       +
       urllib.request.urlopen = deny_network_access

     

       56
       56
       +
       urllib3.connection.HTTPSConnection._new_conn = deny_network_access

     

       57
       57
       +
       websockets.connect = deny_network_access

+175

pkgs/development/python-modules/gradio/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pythonOlder

     

       5
       5
       +
       , pythonRelaxDepsHook

     

       6
       6
       +
       , writeText

     

       7
       7
       +
       

     

       8
       8
       +
       # pyproject

     

       9
       9
       +
       , hatchling

     

       10
       10
       +
       , hatch-requirements-txt

     

       11
       11
       +
       , hatch-fancy-pypi-readme

     

       12
       12
       +
       

     

       13
       13
       +
       # runtime

     

       14
       14
       +
       , setuptools

     

       15
       15
       +
       , aiofiles

     

       16
       16
       +
       , aiohttp

     

       17
       17
       +
       , altair

     

       18
       18
       +
       , fastapi

     

       19
       19
       +
       , ffmpy

     

       20
       20
       +
       , markdown-it-py

     

       21
       21
       +
       , mdit-py-plugins

     

       22
       22
       +
       , markupsafe

     

       23
       23
       +
       , matplotlib

     

       24
       24
       +
       , numpy

     

       25
       25
       +
       , orjson

     

       26
       26
       +
       , pandas

     

       27
       27
       +
       , pillow

     

       28
       28
       +
       , pycryptodome

     

       29
       29
       +
       , python-multipart

     

       30
       30
       +
       , pydub

     

       31
       31
       +
       , pyyaml

     

       32
       32
       +
       , requests

     

       33
       33
       +
       , uvicorn

     

       34
       34
       +
       , jinja2

     

       35
       35
       +
       , fsspec

     

       36
       36
       +
       , httpx

     

       37
       37
       +
       , pydantic

     

       38
       38
       +
       , websockets

     

       39
       39
       +
       , typing-extensions

     

       40
       40
       +
       

     

       41
       41
       +
       # check

     

       42
       42
       +
       , pytestCheckHook

     

       43
       43
       +
       , pytest-asyncio

     

       44
       44
       +
       , mlflow

     

       45
       45
       +
       , huggingface-hub

     

       46
       46
       +
       , transformers

     

       47
       47
       +
       , wandb

     

       48
       48
       +
       , respx

     

       49
       49
       +
       , scikit-image

     

       50
       50
       +
       , ipython

     

       51
       51
       +
       , ffmpeg

     

       52
       52
       +
       , vega_datasets

     

       53
       53
       +
       , boto3

     

       54
       54
       +
       }:

     

       55
       55
       +
       

     

       56
       56
       +
       buildPythonPackage rec {

     

       57
       57
       +
         pname = "gradio";

     

       58
       58
       +
         version = "3.20.1";

     

       59
       59
       +
         format = "pyproject";

     

       60
       60
       +
       

     

       61
       61
       +
         disabled = pythonOlder "3.7";

     

       62
       62
       +
       

     

       63
       63
       +
         # We use the Pypi release, as it provides prebuilt webui assets,

     

       64
       64
       +
         # and has more frequent releases compared to github tags

     

       65
       65
       +
         src = fetchPypi {

     

       66
       66
       +
           inherit pname version;

     

       67
       67
       +
           hash = "sha256-oG97GwehyBWjWXzDqyfj+x2mAfM6OQhYKdA3j0Rv8Vs=";

     

       68
       68
       +
         };

     

       69
       69
       +
       

     

       70
       70
       +
         pythonRelaxDeps = [

     

       71
       71
       +
           "mdit-py-plugins"

     

       72
       72
       +
         ];

     

       73
       73
       +
       

     

       74
       74
       +
         nativeBuildInputs = [

     

       75
       75
       +
           pythonRelaxDepsHook

     

       76
       76
       +
           hatchling

     

       77
       77
       +
           hatch-requirements-txt

     

       78
       78
       +
           hatch-fancy-pypi-readme

     

       79
       79
       +
         ];

     

       80
       80
       +
       

     

       81
       81
       +
         propagatedBuildInputs = [

     

       82
       82
       +
           setuptools # needs pkg_resources

     

       83
       83
       +
           aiofiles

     

       84
       84
       +
           aiohttp

     

       85
       85
       +
           altair

     

       86
       86
       +
           fastapi

     

       87
       87
       +
           ffmpy

     

       88
       88
       +
           markdown-it-py

     

       89
       89
       +
           mdit-py-plugins

     

       90
       90
       +
           markupsafe

     

       91
       91
       +
           matplotlib

     

       92
       92
       +
           numpy

     

       93
       93
       +
           orjson

     

       94
       94
       +
           pandas

     

       95
       95
       +
           pillow

     

       96
       96
       +
           pycryptodome

     

       97
       97
       +
           python-multipart

     

       98
       98
       +
           pydub

     

       99
       99
       +
           pyyaml

     

       100
       100
       +
           requests

     

       101
       101
       +
           uvicorn

     

       102
       102
       +
           jinja2

     

       103
       103
       +
           fsspec

     

       104
       104
       +
           httpx

     

       105
       105
       +
           pydantic

     

       106
       106
       +
           websockets

     

       107
       107
       +
           typing-extensions

     

       108
       108
       +
         ] ++ markdown-it-py.optional-dependencies.linkify;

     

       109
       109
       +
       

     

       110
       110
       +
         nativeCheckInputs = [

     

       111
       111
       +
           pytestCheckHook

     

       112
       112
       +
           pytest-asyncio

     

       113
       113
       +
           mlflow

     

       114
       114
       +
           #comet-ml # FIXME: enable once packaged

     

       115
       115
       +
           huggingface-hub

     

       116
       116
       +
           transformers

     

       117
       117
       +
           wandb

     

       118
       118
       +
           respx

     

       119
       119
       +
           scikit-image

     

       120
       120
       +
           ipython

     

       121
       121
       +
           ffmpeg

     

       122
       122
       +
           vega_datasets

     

       123
       123
       +
           boto3

     

       124
       124
       +
           # shap is needed as well, but breaks too often

     

       125
       125
       +
         ];

     

       126
       126
       +
       

     

       127
       127
       +
         # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail).

     

       128
       128
       +
         # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi.

     

       129
       129
       +
         preCheck = let

     

       130
       130
       +
         in ''

     

       131
       131
       +
           export HOME=$TMPDIR

     

       132
       132
       +
           cat ${./conftest-skip-network-errors.py} >> test/conftest.py

     

       133
       133
       +
         '';

     

       134
       134
       +
       

     

       135
       135
       +
         disabledTests = [

     

       136
       136
       +
           # Actually broken

     

       137
       137
       +
           "test_mount_gradio_app"

     

       138
       138
       +
       

     

       139
       139
       +
           # FIXME: enable once comet-ml is packaged

     

       140
       140
       +
           "test_inline_display"

     

       141
       141
       +
           "test_integration_comet"

     

       142
       142
       +
       

     

       143
       143
       +
           # Flaky, tries to pin dependency behaviour. Sensitive to dep versions

     

       144
       144
       +
           # These error only affect downstream use of the check dependencies.

     

       145
       145
       +
           "test_no_color"

     

       146
       146
       +
           "test_in_interface_as_output"

     

       147
       147
       +
           "test_should_warn_url_not_having_version"

     

       148
       148
       +
       

     

       149
       149
       +
           # Flaky, unknown reason

     

       150
       150
       +
           "test_in_interface"

     

       151
       151
       +
       

     

       152
       152
       +
           # shap is too often broken in nixpkgs

     

       153
       153
       +
           "test_shapley_text"

     

       154
       154
       +
         ];

     

       155
       155
       +
         disabledTestPaths = [

     

       156
       156
       +
           # makes pytest freeze 50% of the time

     

       157
       157
       +
           "test/test_interfaces.py"

     

       158
       158
       +
         ];

     

       159
       159
       +
         #pytestFlagsArray = [ "-x" "-W" "ignore" ]; # uncomment for debugging help

     

       160
       160
       +
       

     

       161
       161
       +
         # check the binary works outside the build env

     

       162
       162
       +
         doInstallCheck = true;

     

       163
       163
       +
         postInstallCheck = ''

     

       164
       164
       +
           env --ignore-environment $out/bin/gradio --help >/dev/null

     

       165
       165
       +
         '';

     

       166
       166
       +
       

     

       167
       167
       +
         pythonImportsCheck = [ "gradio" ];

     

       168
       168
       +
       

     

       169
       169
       +
         meta = with lib; {

     

       170
       170
       +
           homepage = "https://www.gradio.app/";

     

       171
       171
       +
           description = "Python library for easily interacting with trained machine learning models";

     

       172
       172
       +
           license = licenses.asl20;

     

       173
       173
       +
           maintainers = with maintainers; [ pbsds ];

     

       174
       174
       +
         };

     

       175
       175
       +
       }

+6 -2

pkgs/development/python-modules/graphene-django/default.nix

···

       1
       1
       -
       { lib

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       2
       3
        
       , buildPythonPackage

     

       3
       4
        
       , pythonAtLeast

     

       4
       5
        
       , pythonOlder

     
···

       61
       62
        
         ];

     

       62
       63
        
       

     

       63
       64
        
         disabledTests = lib.optionals (pythonAtLeast "3.11") [

     

       64
       64
       -
           # Pèython 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365

     

       65
       65
       +
           # Python 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365

     

       65
       66
        
           "test_django_objecttype_convert_choices_enum_naming_collisions"

     

       66
       67
        
           "test_django_objecttype_choices_custom_enum_name"

     

       67
       68
        
           "test_django_objecttype_convert_choices_enum_list"

     

       68
       69
        
           "test_schema_representation"

     

       70
       70
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       71
       71
       +
           # this test touches files in the "/" directory and fails in darwin sandbox

     

       72
       72
       +
           "test_should_filepath_convert_string"

     

       69
       73
        
         ];

     

       70
       74
        
       

     

       71
       75
        
         meta = with lib; {

-2

pkgs/development/python-modules/gunicorn/default.nix

···

       6
       6
        
       , eventlet

     

       7
       7
        
       , gevent

     

       8
       8
        
       , pytestCheckHook

     

       9
       9
       -
       , setuptools

     

       10
       9
        
       }:

     

       11
       10
        
       

     

       12
       11
        
       buildPythonPackage rec {

     
···

       28
       27
        
         '';

     

       29
       28
        
       

     

       30
       29
        
         propagatedBuildInputs = [

     

       31
       31
       -
           setuptools

     

       32
       30
        
           packaging

     

       33
       31
        
         ];

     

       34
       32

+6 -4

pkgs/development/python-modules/httplib2/default.nix

···

       26
       26
        
           hash = "sha256-1Pl+l28J7crfO2UY/9/D019IzOHWOwjR+UvVEHICTqU=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       +
         postPatch = ''

     

       30
       30
       +
           sed -i "/--cov/d" setup.cfg

     

       31
       31
       +
         '';

     

       32
       32
       +
       

     

       29
       33
        
         propagatedBuildInputs = [

     

       30
       34
        
           pyparsing

     

       31
       35
        
         ];

     
···

       40
       44
        
           pytestCheckHook

     

       41
       45
        
         ];

     

       42
       46
        
       

     

       47
       47
       +
         __darwinAllowLocalNetworking = true;

     

       48
       48
       +
       

     

       43
       49
        
         # Don't run tests for older Pythons

     

       44
       50
        
         doCheck = pythonAtLeast "3.9";

     

       45
       45
       -
       

     

       46
       46
       -
         postPatch = ''

     

       47
       47
       -
           sed -i "/--cov/d" setup.cfg

     

       48
       48
       -
         '';

     

       49
       51
        
       

     

       50
       52
        
         disabledTests = [

     

       51
       53
        
           # ValueError: Unable to load PEM file.

+2

pkgs/development/python-modules/httpx-socks/default.nix

···

       54
       54
        
           ];

     

       55
       55
        
         };

     

       56
       56
        
       

     

       57
       57
       +
         __darwinAllowLocalNetworking = true;

     

       58
       58
       +
       

     

       57
       59
        
         nativeCheckInputs = [

     

       58
       60
        
           flask

     

       59
       61
        
           hypercorn

+11 -2

pkgs/development/python-modules/josepy/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , cryptography

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       , fetchPypi

     

       5
       6
        
       , pyopenssl

     

       6
       7
        
       , pytestCheckHook

     

       7
       8
        
       , pythonOlder

     

       8
       8
       -
       , setuptools

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     
···

       20
       20
        
           hash = "sha256-iTHa84+KTIUnSg6LfLJa3f2NHyj5+4++0FPdUa7HXck=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       +
         patches = [

     

       24
       24
       +
           # https://github.com/certbot/josepy/pull/158

     

       25
       25
       +
           (fetchpatch {

     

       26
       26
       +
             name = "fix-setuptools-deprecation.patch";

     

       27
       27
       +
             url = "https://github.com/certbot/josepy/commit/8f1b4b57a29a868a87fd6eee19a67a7ebfc07ea1.patch";

     

       28
       28
       +
             hash = "sha256-9d+Bk/G4CJXpnjJU0YkXLsg0G3tPxR8YN2niqriQQkI=";

     

       29
       29
       +
             includes = [ "tests/test_util.py" ];

     

       30
       30
       +
           })

     

       31
       31
       +
         ];

     

       32
       32
       +
       

     

       23
       33
        
         propagatedBuildInputs = [

     

       24
       34
        
           pyopenssl

     

       25
       35
        
           cryptography

     

       26
       26
       -
           setuptools

     

       27
       36
        
         ];

     

       28
       37
        
       

     

       29
       38
        
         nativeCheckInputs = [

+7

pkgs/development/python-modules/markdown-it-py/default.nix

···

       19
       19
        
       , stdenv

     

       20
       20
        
       , pytest-regressions

     

       21
       21
        
       , pytestCheckHook

     

       22
       22
       +
       , pythonRelaxDepsHook

     

       22
       23
        
       , pythonOlder

     

       23
       24
        
       }:

     

       24
       25
        
       

     
···

       36
       37
        
           hash = "sha256-qdRU1BxczFDGoIEtl0ZMkKNn4p5tec8YuPt5ZwX5fYM=";

     

       37
       38
        
         };

     

       38
       39
        
       

     

       40
       40
       +
         # fix downstrem usage of markdown-it-py[linkify]

     

       41
       41
       +
         pythonRelaxDeps = [

     

       42
       42
       +
           "linkify-it-py"

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       39
       45
        
         nativeBuildInputs = [

     

       46
       46
       +
           pythonRelaxDepsHook

     

       40
       47
        
           flit-core

     

       41
       48
        
         ];

     

       42
       49

-7

pkgs/development/python-modules/meson-python/default.nix

···

       43
       43
        
           ./add-build-flags.sh

     

       44
       44
        
         ];

     

       45
       45
        
       

     

       46
       46
       -
         # Ugly work-around. Drop ninja dependency.

     

       47
       47
       -
         # We already have ninja, but it comes without METADATA.

     

       48
       48
       -
         # Building ninja-python-distributions is the way to go.

     

       49
       49
       -
         postPatch = ''

     

       50
       50
       -
           substituteInPlace pyproject.toml --replace "'ninja'," ""

     

       51
       51
       -
         '';

     

       52
       52
       -
       

     

       53
       46
        
         meta = {

     

       54
       47
        
           changelog = "https://github.com/mesonbuild/meson-python/blob/${version}/CHANGELOG.rst";

     

       55
       48
        
           description = "Meson Python build backend (PEP 517)";

+2

pkgs/development/python-modules/mezzanine/default.nix

···

       14
       14
        
       , pillow

     

       15
       15
        
       , pyflakes

     

       16
       16
        
       , pythonOlder

     

       17
       17
       +
       , pytz

     

       17
       18
        
       , requests

     

       18
       19
        
       , requests-oauthlib

     

       19
       20
        
       , tzlocal

     
···

       47
       48
        
           future

     

       48
       49
        
           grappelli_safe

     

       49
       50
        
           pillow

     

       51
       51
       +
           pytz

     

       50
       52
        
           requests

     

       51
       53
        
           requests-oauthlib

     

       52
       54
        
           tzlocal

+10 -15

pkgs/development/python-modules/mock/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , fetchpatch

     

       5
       5
       -
       , python

     

       6
       4
        
       , pythonOlder

     

       7
       7
       -
       , pytest

     

       8
       8
       -
       , unittestCheckHook

     

       5
       5
       +
       , pytestCheckHook

     

       9
       6
        
       }:

     

       10
       7
        
       

     

       11
       8
        
       buildPythonPackage rec {

     

       12
       9
        
         pname = "mock";

     

       13
       13
       -
         version = "4.0.3";

     

       10
       10
       +
         version = "5.1.0";

     

       14
       11
        
         format = "setuptools";

     

       15
       12
        
       

     

       16
       13
        
         disabled = pythonOlder "3.6";

     

       17
       14
        
       

     

       18
       15
        
         src = fetchPypi {

     

       19
       16
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc";

     

       17
       17
       +
           sha256 = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0=";

     

       21
       18
        
         };

     

       22
       19
        
       

     

       23
       23
       -
         patches = [

     

       24
       24
       -
           (fetchpatch {

     

       25
       25
       -
             url = "https://github.com/testing-cabal/mock/commit/f3e3d82aab0ede7e25273806dc0505574d85eae2.patch";

     

       26
       26
       -
             hash = "sha256-wPrv1/WeICZHn31UqFlICFsny2knvn3+Xg8BZoaGbwQ=";

     

       27
       27
       -
           })

     

       20
       20
       +
         nativeCheckInputs = [

     

       21
       21
       +
           pytestCheckHook

     

       28
       22
        
         ];

     

       29
       23
        
       

     

       30
       30
       -
         nativeCheckInputs = [

     

       31
       31
       -
           unittestCheckHook

     

       32
       32
       -
           pytest

     

       24
       24
       +
         pythonImportsCheck = [

     

       25
       25
       +
           "mock"

     

       33
       26
        
         ];

     

       34
       27
        
       

     

       35
       28
        
         meta = with lib; {

     

       36
       36
       -
           description = "Mock objects for Python";

     

       29
       29
       +
           description = "Rolling backport of unittest.mock for all Pythons";

     

       37
       30
        
           homepage = "https://github.com/testing-cabal/mock";

     

       31
       31
       +
           changelog = "https://github.com/testing-cabal/mock/blob/${version}/CHANGELOG.rst";

     

       38
       32
        
           license = licenses.bsd2;

     

       33
       33
       +
           maintainers = [ ];

     

       39
       34
        
         };

     

       40
       35
        
       }

+2

pkgs/development/python-modules/moto/default.nix

···

       79
       79
        
           xmltodict

     

       80
       80
        
         ];

     

       81
       81
        
       

     

       82
       82
       +
         __darwinAllowLocalNetworking = true;

     

       83
       83
       +
       

     

       82
       84
        
         nativeCheckInputs = [

     

       83
       85
        
           freezegun

     

       84
       86
        
           pytestCheckHook

+23 -48

pkgs/development/python-modules/ninja/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , fetchurl

     

       5
       5
       -
       , cmake

     

       6
       6
       -
       , setuptools-scm

     

       7
       7
       -
       , scikit-build

     

       8
       8
       -
       , pytestCheckHook

     

       9
       9
       -
       , pytest-virtualenv

     

       3
       3
       +
       , flit-core

     

       4
       4
       +
       , ninja

     

       10
       5
        
       }:

     

       11
       11
       -
       let

     

       12
       12
       -
         # these must match NinjaUrls.cmake

     

       13
       13
       -
         ninja_src_url = "https://github.com/Kitware/ninja/archive/v1.11.1.g95dee.kitware.jobserver-1.tar.gz";

     

       14
       14
       -
         ninja_src_sha256 = "7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db";

     

       15
       15
       -
         ninja_src = fetchurl {

     

       16
       16
       -
           url = ninja_src_url;

     

       17
       17
       -
           sha256 = ninja_src_sha256;

     

       18
       18
       -
         };

     

       19
       19
       -
       in

     

       6
       6
       +
       

     

       20
       7
        
       buildPythonPackage rec {

     

       21
       8
        
         pname = "ninja";

     

       22
       22
       -
         version = "1.11.1";

     

       9
       9
       +
         inherit (ninja) version;

     

       23
       10
        
         format = "pyproject";

     

       24
       11
        
       

     

       25
       25
       -
         src = fetchFromGitHub {

     

       26
       26
       -
           owner = "scikit-build";

     

       27
       27
       -
           repo = "ninja-python-distributions";

     

       28
       28
       -
           rev = version;

     

       29
       29
       -
           hash = "sha256-scCYsSEyN+u3qZhNhWYqHpJCl+JVJJbKz+T34gOXGJM=";

     

       30
       30
       -
         };

     

       31
       31
       -
         patches = [

     

       32
       32
       -
           # make sure cmake doesn't try to download the ninja sources

     

       33
       33
       -
           ./no-download.patch

     

       34
       34
       -
         ];

     

       12
       12
       +
         src = ./stub;

     

       35
       13
        
       

     

       36
       36
       -
         inherit ninja_src;

     

       37
       14
        
         postUnpack = ''

     

       38
       38
       -
           # assume that if the hash matches, the source should be fine

     

       39
       39
       -
           if ! grep "${ninja_src_sha256}" $sourceRoot/NinjaUrls.cmake; then

     

       40
       40
       -
             echo "ninja_src_sha256 doesn't match the hash in NinjaUrls.cmake!"

     

       41
       41
       -
             exit 1

     

       42
       42
       -
           fi

     

       43
       43
       -
           mkdir -p "$sourceRoot/Ninja-src"

     

       44
       44
       -
           pushd "$sourceRoot/Ninja-src"

     

       45
       45
       -
           tar -xavf ${ninja_src} --strip-components 1

     

       46
       46
       -
           popd

     

       47
       47
       -
         '';

     

       15
       15
       +
           substituteInPlace "$sourceRoot/pyproject.toml" \

     

       16
       16
       +
             --subst-var version

     

       48
       17
        
       

     

       49
       49
       -
         postPatch = ''

     

       50
       50
       -
           sed -i '/cov/d' setup.cfg

     

       18
       18
       +
           substituteInPlace "$sourceRoot/ninja/__init__.py" \

     

       19
       19
       +
             --subst-var-by BIN_DIR "${ninja}/bin"

     

       51
       20
        
         '';

     

       52
       21
        
       

     

       53
       53
       -
         dontUseCmakeConfigure = true;

     

       22
       22
       +
         inherit (ninja) setupHook;

     

       54
       23
        
       

     

       55
       24
        
         nativeBuildInputs = [

     

       56
       56
       -
           setuptools-scm

     

       57
       57
       -
           scikit-build

     

       58
       58
       -
           cmake

     

       25
       25
       +
           flit-core

     

       59
       26
        
         ];

     

       60
       27
        
       

     

       61
       61
       -
         nativeCheckInputs = [

     

       62
       62
       -
           pytestCheckHook

     

       63
       63
       -
           pytest-virtualenv

     

       28
       28
       +
         preBuild = ''

     

       29
       29
       +
           cp "${ninja.src}/misc/ninja_syntax.py" ninja/ninja_syntax.py

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         pythonImportsCheck = [

     

       33
       33
       +
           "ninja"

     

       34
       34
       +
           "ninja.ninja_syntax"

     

       64
       35
        
         ];

     

       65
       36
        
       

     

       66
       37
        
         meta = with lib; {

     

       67
       38
        
           description = "A small build system with a focus on speed";

     

       39
       39
       +
           longDescription = ''

     

       40
       40
       +
             This is a stub of the ninja package on PyPI that uses the ninja program

     

       41
       41
       +
             provided by nixpkgs instead of downloading ninja from the web.

     

       42
       42
       +
           '';

     

       68
       43
        
           homepage = "https://github.com/scikit-build/ninja-python-distributions";

     

       69
       44
        
           license = licenses.asl20;

     

       70
       70
       -
           maintainers = with maintainers; [ _999eagle ];

     

       45
       45
       +
           maintainers = with maintainers; [ _999eagle tjni ];

     

       71
       46
        
         };

     

       72
       47
        
       }

-10

pkgs/development/python-modules/ninja/no-download.patch

···

       1
       1
       -
       --- a/CMakeLists.txt

     

       2
       2
       -
       +++ b/CMakeLists.txt

     

       3
       3
       -
       @@ -64,6 +64,7 @@

     

       4
       4
       -
          # Download selected source archive

     

       5
       5
       -
          ExternalProject_add(download_ninja_source

     

       6
       6
       -
            SOURCE_DIR ${Ninja_SOURCE_DIR}

     

       7
       7
       -
       +    DOWNLOAD_COMMAND ""

     

       8
       8
       -
            URL ${${src_archive}_url}

     

       9
       9
       -
            URL_HASH SHA256=${${src_archive}_sha256}

     

       10
       10
       -
            DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR}

+9

pkgs/development/python-modules/ninja/stub/ninja/__init__.py

···

       1
       1
       +
       import os

     

       2
       2
       +
       import subprocess

     

       3
       3
       +
       import sys

     

       4
       4
       +
       

     

       5
       5
       +
       def _program(name, args):

     

       6
       6
       +
           return subprocess.call([os.path.join('@BIN_DIR@', name)] + args, close_fds=False)

     

       7
       7
       +
       

     

       8
       8
       +
       def ninja():

     

       9
       9
       +
           raise SystemExit(_program('ninja', sys.argv[1:]))

+11

pkgs/development/python-modules/ninja/stub/pyproject.toml

···

       1
       1
       +
       [build-system]

     

       2
       2
       +
       requires = ["flit_core"]

     

       3
       3
       +
       build-backend = "flit_core.buildapi"

     

       4
       4
       +
       

     

       5
       5
       +
       [project]

     

       6
       6
       +
       name = "ninja"

     

       7
       7
       +
       version = "@version@"

     

       8
       8
       +
       description = "Ninja is a small build system with a focus on speed"

     

       9
       9
       +
       

     

       10
       10
       +
       [project.scripts]

     

       11
       11
       +
       ninja = "ninja:ninja"

+2

pkgs/development/python-modules/nose2/default.nix

···

       24
       24
        
           six

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
       +
         __darwinAllowLocalNetworking = true;

     

       28
       28
       +
       

     

       27
       29
        
         checkPhase = ''

     

       28
       30
        
           ${python.interpreter} -m unittest

     

       29
       31
        
         '';

+2

pkgs/development/python-modules/nplusone/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , blinker

     

       3
       3
        
       , buildPythonPackage

     

       4
       4
       +
       , django

     

       4
       5
        
       , fetchFromGitHub

     

       5
       6
        
       , flake8

     

       6
       7
        
       , flask-sqlalchemy

     
···

       79
       80
        
           homepage = "https://github.com/jmcarp/nplusone";

     

       80
       81
        
           maintainers = with maintainers; [ cript0nauta ];

     

       81
       82
        
           license = licenses.mit;

     

       83
       83
       +
           broken = lib.versionAtLeast django.version "4";

     

       82
       84
        
         };

     

       83
       85
        
       }

+2

pkgs/development/python-modules/nvchecker/default.nix

···

       49
       49
        
           tomli

     

       50
       50
        
         ];

     

       51
       51
        
       

     

       52
       52
       +
         __darwinAllowLocalNetworking = true;

     

       53
       53
       +
       

     

       52
       54
        
         nativeCheckInputs = [

     

       53
       55
        
           flaky

     

       54
       56
        
           pytest-asyncio

+3 -3

pkgs/development/python-modules/orjson/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "orjson";

     

       19
       19
       -
         version = "3.9.2";

     

       19
       19
       +
         version = "3.9.4";

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     
···

       25
       25
        
           owner = "ijl";

     

       26
       26
        
           repo = pname;

     

       27
       27
        
           rev = "refs/tags/${version}";

     

       28
       28
       -
           hash = "sha256-uEwlrWPQbctCMiIz4fdXe2GDr2SSHaMzmYzzrECerxg=";

     

       28
       28
       +
           hash = "sha256-WS4qynQmJIVdDf0sYK/HFVQ+F5nfoJwx/zzmaL6YTRc=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       32
       32
        
           inherit src;

     

       33
       33
        
           name = "${pname}-${version}";

     

       34
       34
       -
           hash = "sha256-U/WenkO7ecZQOGEppBlLtlXGtbpbS7e+Ic1hg/AnKSk=";

     

       34
       34
       +
           hash = "sha256-hGUXPTiKvKygxQzxXAO/+bD34eLnpkhQ7r/g27E+d4I=";

     

       35
       35
        
         };

     

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [

+4

pkgs/development/python-modules/oscrypto/default.nix

···

       22
       22
        
           hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       +
         patches = [

     

       26
       26
       +
           ./support-openssl-3.0.10.patch

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       25
       29
        
         postPatch = ''

     

       26
       30
        
           for file in oscrypto/_openssl/_lib{crypto,ssl}_c{ffi,types}.py; do

     

       27
       31
        
             substituteInPlace $file \

+11

pkgs/development/python-modules/oscrypto/support-openssl-3.0.10.patch

···

       1
       1
       +
       https://github.com/wbond/oscrypto/issues/75

     

       2
       2
       +
       --- a/oscrypto/_openssl/_libcrypto_cffi.py

     

       3
       3
       +
       +++ b/oscrypto/_openssl/_libcrypto_cffi.py

     

       4
       4
       +
       @@ -37,1 +37,1 @@

     

       5
       5
       +
       -version_match = re.search('\\b(\\d\\.\\d\\.\\d[a-z]*)\\b', version_string)

     

       6
       6
       +
       +version_match = re.search('\\b(\\d\\.\\d\\.\\d+[a-z]*)\\b', version_string)

     

       7
       7
       +
       --- a/oscrypto/_openssl/_libcrypto_ctypes.py

     

       8
       8
       +
       +++ b/oscrypto/_openssl/_libcrypto_ctypes.py

     

       9
       9
       +
       @@ -40,1 +40,1 @@

     

       10
       10
       +
       -version_match = re.search('\\b(\\d\\.\\d\\.\\d[a-z]*)\\b', version_string)

     

       11
       11
       +
       +version_match = re.search('\\b(\\d\\.\\d\\.\\d+[a-z]*)\\b', version_string)

+2

pkgs/development/python-modules/prometheus-client/default.nix

···

       19
       19
        
           hash = "sha256-ag9gun47Ar0Sw3ZGIXAHjtv4GdhX8x51UVkgwdQ8A+s=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       +
         __darwinAllowLocalNetworking = true;

     

       23
       23
       +
       

     

       22
       24
        
         nativeCheckInputs = [

     

       23
       25
        
           pytestCheckHook

     

       24
       26
        
         ];

+2

pkgs/development/python-modules/pycurl/default.nix

···

       46
       46
        
           curl

     

       47
       47
        
         ];

     

       48
       48
        
       

     

       49
       49
       +
         __darwinAllowLocalNetworking = true;

     

       50
       50
       +
       

     

       49
       51
        
         nativeCheckInputs = [

     

       50
       52
        
           bottle

     

       51
       53
        
           pytestCheckHook

+2

pkgs/development/python-modules/pyquery/default.nix

···

       33
       33
        
           lxml

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
       +
         __darwinAllowLocalNetworking = true;

     

       37
       37
       +
       

     

       36
       38
        
         pythonImportsCheck = [ "pyquery" ];

     

       37
       39
        
       

     

       38
       40
        
         checkInputs = [

+2

pkgs/development/python-modules/pyro5/default.nix

···

       24
       24
        
           serpent

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
       +
         __darwinAllowLocalNetworking = true;

     

       28
       28
       +
       

     

       27
       29
        
         nativeCheckInputs = [

     

       28
       30
        
           pytestCheckHook

     

       29
       31
        
         ];

+2

pkgs/development/python-modules/pytest-recording/default.nix

···

       33
       33
        
           attrs

     

       34
       34
        
         ];

     

       35
       35
        
       

     

       36
       36
       +
         __darwinAllowLocalNetworking = true;

     

       37
       37
       +
       

     

       36
       38
        
         checkInputs = [

     

       37
       39
        
           pytestCheckHook

     

       38
       40
        
           pytest-httpbin

+2

pkgs/development/python-modules/pytest-remotedata/default.nix

···

       32
       32
        
           six

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
       +
         __darwinAllowLocalNetworking = true;

     

       36
       36
       +
       

     

       35
       37
        
         nativeCheckInputs = [

     

       36
       38
        
           pytestCheckHook

     

       37
       39
        
         ];

+2

pkgs/development/python-modules/pytest-tornasync/default.nix

···

       21
       21
        
           tornado

     

       22
       22
        
         ];

     

       23
       23
        
       

     

       24
       24
       +
         __darwinAllowLocalNetworking = true;

     

       25
       25
       +
       

     

       24
       26
        
         nativeCheckInputs = [

     

       25
       27
        
           pytest

     

       26
       28
        
           tornado

+2

pkgs/development/python-modules/pywemo/default.nix

···

       37
       37
        
           lxml

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
       +
         __darwinAllowLocalNetworking = true;

     

       41
       41
       +
       

     

       40
       42
        
         nativeCheckInputs = [

     

       41
       43
        
           hypothesis

     

       42
       44
        
           pytest-vcr

+2

pkgs/development/python-modules/pyzipper/default.nix

···

       24
       24
        
           pycryptodomex

     

       25
       25
        
         ];

     

       26
       26
        
       

     

       27
       27
       +
         __darwinAllowLocalNetworking = true;

     

       28
       28
       +
       

     

       27
       29
        
         nativeCheckInputs = [

     

       28
       30
        
           pytestCheckHook

     

       29
       31
        
         ];

+5

pkgs/development/python-modules/qcodes/default.nix

···

       133
       133
        
           "--durations=20"

     

       134
       134
        
         ];

     

       135
       135
        
       

     

       136
       136
       +
         disabledTests = [

     

       137
       137
       +
           # timing sensitive

     

       138
       138
       +
           "test_access_channels_by_slice"

     

       139
       139
       +
         ];

     

       140
       140
       +
       

     

       136
       141
        
         disabledTestPaths = [

     

       137
       142
        
           # depends on qcodes-loop, causing a cyclic dependency

     

       138
       143
        
           "qcodes/tests/dataset/measurement/test_load_legacy_data.py"

+2

pkgs/development/python-modules/rangehttpserver/default.nix

···

       22
       22
        
           setuptools

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
       +
         __darwinAllowLocalNetworking = true;

     

       26
       26
       +
       

     

       25
       27
        
         nativeCheckInputs = [

     

       26
       28
        
           pytestCheckHook

     

       27
       29
        
           requests

+2 -2

pkgs/development/python-modules/responses/default.nix

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "responses";

     

       20
       20
       -
         version = "0.23.1";

     

       20
       20
       +
         version = "0.23.3";

     

       21
       21
        
         format = "setuptools";

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.7";

     
···

       28
       28
        
           owner = "getsentry";

     

       29
       29
        
           repo = pname;

     

       30
       30
        
           rev = "refs/tags/${version}";

     

       31
       31
       -
           hash = "sha256-BU90nUZVqowFMn78KfbBEf59X7Q/1itvkGFdOzy4D2c=";

     

       31
       31
       +
           hash = "sha256-VJmcRMn0O+3mDwzkCwxIX7RU3/I9T9p9N8t6USWDZJQ=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         propagatedBuildInputs = [

+2

pkgs/development/python-modules/rope/default.nix

···

       30
       30
        
           pytoolconfig

     

       31
       31
        
         ] ++ pytoolconfig.optional-dependencies.global;

     

       32
       32
        
       

     

       33
       33
       +
         __darwinAllowLocalNetworking = true;

     

       34
       34
       +
       

     

       33
       35
        
         nativeCheckInputs = [

     

       34
       36
        
           pytest-timeout

     

       35
       37
        
           pytestCheckHook

+2

pkgs/development/python-modules/snakeviz/default.nix

···

       31
       31
        
           tornado

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
       +
         __darwinAllowLocalNetworking = true;

     

       35
       35
       +
       

     

       34
       36
        
         nativeCheckInputs = [

     

       35
       37
        
           ipython

     

       36
       38
        
           pytestCheckHook

+2

pkgs/development/python-modules/sockio/default.nix

···

       27
       27
        
             --replace "--durations=2 --verbose" ""

     

       28
       28
        
         '';

     

       29
       29
        
       

     

       30
       30
       +
         __darwinAllowLocalNetworking = true;

     

       31
       31
       +
       

     

       30
       32
        
         nativeCheckInputs = [

     

       31
       33
        
           pytest-asyncio

     

       32
       34
        
           pytestCheckHook

+11 -1

pkgs/development/python-modules/sshfs/default.nix

···

       1
       1
       -
       { lib

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       2
       3
        
       , asyncssh

     

       3
       4
        
       , bcrypt

     

       4
       5
        
       , buildPythonPackage

     
···

       7
       8
        
       , mock-ssh-server

     

       8
       9
        
       , pytest-asyncio

     

       9
       10
        
       , pytestCheckHook

     

       11
       11
       +
       , setuptools

     

       10
       12
        
       , setuptools-scm

     

       11
       13
        
       }:

     

       12
       14
        
       

     
···

       24
       26
        
         SETUPTOOLS_SCM_PRETEND_VERSION = version;

     

       25
       27
        
       

     

       26
       28
        
         nativeBuildInputs = [

     

       29
       29
       +
           setuptools

     

       27
       30
        
           setuptools-scm

     

       28
       31
        
         ];

     

       29
       32
        
       

     
···

       33
       36
        
           fsspec

     

       34
       37
        
         ];

     

       35
       38
        
       

     

       39
       39
       +
         __darwinAllowLocalNetworking = true;

     

       40
       40
       +
       

     

       36
       41
        
         nativeCheckInputs = [

     

       37
       42
        
           mock-ssh-server

     

       38
       43
        
           pytest-asyncio

     

       39
       44
        
           pytestCheckHook

     

       45
       45
       +
         ];

     

       46
       46
       +
       

     

       47
       47
       +
         disabledTests = lib.optionals stdenv.isDarwin [

     

       48
       48
       +
           # test fails with sandbox enabled

     

       49
       49
       +
           "test_checksum"

     

       40
       50
        
         ];

     

       41
       51
        
       

     

       42
       52
        
         pythonImportsCheck = [

+2 -1

pkgs/development/python-modules/terminado/default.nix

···

       31
       31
        
           "terminado"

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
       +
         __darwinAllowLocalNetworking = true;

     

       35
       35
       +
       

     

       34
       36
        
         nativeCheckInputs = [

     

       35
       37
        
           pytest-timeout

     

       36
       38
        
           pytestCheckHook

     

       37
       39
        
         ];

     

       38
       38
       -
       

     

       39
       40
        
       

     

       40
       41
        
         meta = with lib; {

     

       41
       42
        
           description = "Terminals served by Tornado websockets";

+2

pkgs/development/python-modules/umodbus/default.nix

···

       25
       25
        
           pyserial

     

       26
       26
        
         ];

     

       27
       27
        
       

     

       28
       28
       +
         __darwinAllowLocalNetworking = true;

     

       29
       29
       +
       

     

       28
       30
        
         nativeCheckInputs = [

     

       29
       31
        
           pytestCheckHook

     

       30
       32
        
         ];

+2

pkgs/development/python-modules/unearth/default.nix

···

       36
       36
        
           cached-property

     

       37
       37
        
         ];

     

       38
       38
        
       

     

       39
       39
       +
         __darwinAllowLocalNetworking = true;

     

       40
       40
       +
       

     

       39
       41
        
         nativeCheckInputs = [

     

       40
       42
        
           flask

     

       41
       43
        
           pytest-httpserver

+2

pkgs/development/python-modules/wandb/default.nix

···

       97
       97
        
           shortuuid

     

       98
       98
        
         ];

     

       99
       99
        
       

     

       100
       100
       +
         __darwinAllowLocalNetworking = true;

     

       101
       101
       +
       

     

       100
       102
        
         nativeCheckInputs = [

     

       101
       103
        
           azure-containerregistry

     

       102
       104
        
           azure-core

+2

pkgs/development/python-modules/wsgidav/default.nix

···

       40
       40
        
           pyyaml

     

       41
       41
        
         ];

     

       42
       42
        
       

     

       43
       43
       +
         __darwinAllowLocalNetworking = true;

     

       44
       44
       +
       

     

       43
       45
        
         nativeCheckInputs = [

     

       44
       46
        
           cheroot

     

       45
       47
        
           pytestCheckHook

+2 -2

pkgs/development/ruby-modules/bundler/default.nix

···

       4
       4
        
         inherit ruby;

     

       5
       5
        
         name = "${gemName}-${version}";

     

       6
       6
        
         gemName = "bundler";

     

       7
       7
       -
         version = "2.4.17";

     

       8
       8
       -
         source.sha256 = "sha256-2EV6XnbJ0VPUuw/R/9Kj9Y+/CQyzRIub16Ah0T8ORK0=";

     

       7
       7
       +
         version = "2.4.18";

     

       8
       8
       +
         source.sha256 = "sha256-tvfScSHUmHSmnJGU1PjvVWsjkMzuxBY1zPTzxYBp9w4=";

     

       9
       9
        
         dontPatchShebangs = true;

     

       10
       10
        
       

     

       11
       11
        
         postFixup = ''

-51

pkgs/development/tools/build-managers/meson/darwin-case-sensitive-fs.patch

···

       1
       1
       -
       From 1643ed0d8a9201732905bee51b096605d26aaaac Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Randy Eckenrode <randy@largeandhighquality.com>

     

       3
       3
       -
       Date: Fri, 26 May 2023 00:10:45 -0400

     

       4
       4
       -
       Subject: [PATCH] Fix test failures on Darwin on a case-sensitive fs

     

       5
       5
       -
       

     

       6
       6
       -
       This issue was encounetered while working on a contribution to nixpkgs.

     

       7
       7
       -
       Nix allows the store to be installed on a separate, case-sensitive APFS

     

       8
       8
       -
       volume. When the store is on a case-sensitive volume, these tests fail

     

       9
       9
       -
       because they try to use `foundation` instead of `Foundation`.

     

       10
       10
       -
       ---

     

       11
       11
       -
        .../failing/78 framework dependency with version/meson.build    | 2 +-

     

       12
       12
       -
        test cases/objc/2 nsstring/meson.build                          | 2 +-

     

       13
       13
       -
        test cases/osx/6 multiframework/meson.build                     | 2 +-

     

       14
       14
       -
        3 files changed, 3 insertions(+), 3 deletions(-)

     

       15
       15
       -
       

     

       16
       16
       -
       diff --git a/test cases/failing/78 framework dependency with version/meson.build b/test cases/failing/78 framework dependency with version/meson.build

     

       17
       17
       -
       index b7e04bab446..ee315ebcbd7 100644

     

       18
       18
       -
       --- a/test cases/failing/78 framework dependency with version/meson.build	

     

       19
       19
       -
       +++ b/test cases/failing/78 framework dependency with version/meson.build	

     

       20
       20
       -
       @@ -5,4 +5,4 @@ if host_machine.system() != 'darwin'

     

       21
       21
       -
        endif

     

       22
       22
       -
        

     

       23
       23
       -
        # do individual frameworks have a meaningful version to test?  And multiple frameworks might be listed...

     

       24
       24
       -
       -dep = dependency('appleframeworks', modules: 'foundation', version: '>0')

     

       25
       25
       -
       +dep = dependency('appleframeworks', modules: 'Foundation', version: '>0')

     

       26
       26
       -
       diff --git a/test cases/objc/2 nsstring/meson.build b/test cases/objc/2 nsstring/meson.build

     

       27
       27
       -
       index 94d2cf18ab4..2c483d50d68 100644

     

       28
       28
       -
       --- a/test cases/objc/2 nsstring/meson.build	

     

       29
       29
       -
       +++ b/test cases/objc/2 nsstring/meson.build	

     

       30
       30
       -
       @@ -1,7 +1,7 @@

     

       31
       31
       -
        project('nsstring', 'objc')

     

       32
       32
       -
        

     

       33
       33
       -
        if host_machine.system() == 'darwin'

     

       34
       34
       -
       -  dep = dependency('appleframeworks', modules : 'foundation')

     

       35
       35
       -
       +  dep = dependency('appleframeworks', modules : 'Foundation')

     

       36
       36
       -
        elif host_machine.system() == 'cygwin'

     

       37
       37
       -
          error('MESON_SKIP_TEST GNUstep is not packaged for Cygwin.')

     

       38
       38
       -
        else

     

       39
       39
       -
       diff --git a/test cases/osx/6 multiframework/meson.build b/test cases/osx/6 multiframework/meson.build

     

       40
       40
       -
       index 28846243b21..57e5d61560b 100644

     

       41
       41
       -
       --- a/test cases/osx/6 multiframework/meson.build	

     

       42
       42
       -
       +++ b/test cases/osx/6 multiframework/meson.build	

     

       43
       43
       -
       @@ -4,7 +4,7 @@ project('multiframework', 'objc')

     

       44
       44
       -
        # that causes a build failure when defining two modules. The

     

       45
       45
       -
        # arguments for the latter module overwrote the arguments for

     

       46
       46
       -
        # the first one rather than adding to them.

     

       47
       47
       -
       -cocoa_dep = dependency('appleframeworks', modules : ['AppKit', 'foundation'])

     

       48
       48
       -
       +cocoa_dep = dependency('appleframeworks', modules : ['AppKit', 'Foundation'])

     

       49
       49
       -
        

     

       50
       50
       -
        executable('deptester',

     

       51
       51
       -
          'main.m',

+7 -9

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
       -
       , fetchPypi

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
        
       , fetchpatch

     

       5
       5
        
       , installShellFiles

     

       6
       6
        
       , ninja

     
···

       18
       18
        
       

     

       19
       19
        
       python3.pkgs.buildPythonApplication rec {

     

       20
       20
        
         pname = "meson";

     

       21
       21
       -
         version = "1.1.1";

     

       21
       21
       +
         version = "1.2.0";

     

       22
       22
        
       

     

       23
       23
       -
         src = fetchPypi {

     

       24
       24
       -
           inherit pname version;

     

       25
       25
       -
           hash = "sha256-0EtUH5fKQ5+4L6t9DUgJiL5L1OYlY6XKNfrbVAByexw=";

     

       23
       23
       +
         src = fetchFromGitHub {

     

       24
       24
       +
           owner = "mesonbuild";

     

       25
       25
       +
           repo = "meson";

     

       26
       26
       +
           rev = "refs/tags/${version}";

     

       27
       27
       +
           hash = "sha256-bJAmkE+sL9DqKpcjZdBf4/z9lz+m/o0Z87hlAwbVbTY=";

     

       26
       28
        
         };

     

       27
       29
        
       

     

       28
       30
        
         patches = [

     

       29
       29
       -
           # Fix Meson tests that fail when the Nix store is case-sensitive APFS.

     

       30
       30
       -
           # https://github.com/mesonbuild/meson/pull/11820

     

       31
       31
       -
           ./darwin-case-sensitive-fs.patch

     

       32
       32
       -
       

     

       33
       31
        
           # Meson is currently inspecting fewer variables than autoconf does, which

     

       34
       32
        
           # makes it harder for us to use setup hooks, etc.  Taken from

     

       35
       33
        
           # https://github.com/mesonbuild/meson/pull/6827

+21 -5

pkgs/development/tools/misc/autogen/default.nix

···

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = let

     

       13
       13
       -
           dp = { ver ? "1%255.18.16-4", pname, name ? (pname + ".diff"), sha256 }: fetchurl {

     

       13
       13
       +
           dp = { ver ? "1%255.18.16-5", name, sha256 }: fetchurl {

     

       14
       14
        
             url = "https://salsa.debian.org/debian/autogen/-/raw/debian/${ver}"

     

       15
       15
       -
                 + "/debian/patches/${pname}.diff?inline=false";

     

       15
       15
       +
                 + "/debian/patches/${name}?inline=false";

     

       16
       16
        
             inherit name sha256;

     

       17
       17
        
           };

     

       18
       18
        
         in [

     

       19
       19
        
           (dp {

     

       20
       20
       -
             pname = "20_no_Werror";

     

       20
       20
       +
             name = "20_no_Werror.diff";

     

       21
       21
        
             sha256 = "08z4s2ifiqyaacjpd9pzr59w8m4j3548kkaq1bwvp2gjn29m680x";

     

       22
       22
        
           })

     

       23
       23
        
           (dp {

     

       24
       24
       -
             pname = "30_ag_macros.m4_syntax_error";

     

       24
       24
       +
             name = "30_ag_macros.m4_syntax_error.diff";

     

       25
       25
        
             sha256 = "1z8vmbwbkz3505wd33i2xx91mlf8rwsa7klndq37nw821skxwyh3";

     

       26
       26
        
           })

     

       27
       27
        
           (dp {

     

       28
       28
       -
             pname = "31_allow_overriding_AGexe_for_crossbuild";

     

       28
       28
       +
             name = "31_allow_overriding_AGexe_for_crossbuild.diff";

     

       29
       29
        
             sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf";

     

       30
       30
       +
           })

     

       31
       31
       +
           (dp {

     

       32
       32
       +
             name = "40_suse_01-autogen-catch-race-error.patch";

     

       33
       33
       +
             sha256 = "1cfkym2zds1f85md1m74snxzqmzlj7wd5jivgmyl342856848xav";

     

       34
       34
       +
           })

     

       35
       35
       +
           (dp {

     

       36
       36
       +
             name = "40_suse_03-gcc9-fix-wrestrict.patch";

     

       37
       37
       +
             sha256 = "1ifdwi6gf96jc78jw7q4bfi5fgdldlf2nl55y20h6xb78kv0pznd";

     

       38
       38
       +
           })

     

       39
       39
       +
           (dp {

     

       40
       40
       +
             name = "40_suse_05-sprintf-overflow.patch";

     

       41
       41
       +
             sha256 = "136m62k68w1h5k7iapynvbyipidw35js6pq21lsc6rpxvgp0n469";

     

       42
       42
       +
           })

     

       43
       43
       +
           (dp {

     

       44
       44
       +
             name = "40_suse_06-autogen-avoid-GCC-code-analysis-bug.patch";

     

       45
       45
       +
             sha256 = "1d65zygzw2rpa00s0jy2y1bg29vkbhnjwlb5pv22rfv87zbk6z9q";

     

       30
       46
        
           })

     

       31
       47
        
           # Next upstream release will contain guile-3 support. We apply non-invasive

     

       32
       48
        
           # patch meanwhile.

+3 -1

pkgs/development/tools/misc/gdb/default.nix

···

       10
       10
        
       , enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform elfutils, elfutils

     

       11
       11
        
       , guile ? null

     

       12
       12
        
       , hostCpuOnly ? false

     

       13
       13
       +
       , enableSim ? false

     

       13
       14
        
       , safePaths ? [

     

       14
       15
        
          # $debugdir:$datadir/auto-load are whitelisted by default by GDB

     

       15
       16
        
          "$debugdir" "$datadir/auto-load"

     
···

       113
       114
        
         ] ++ lib.optional (!pythonSupport) "--without-python"

     

       114
       115
        
           ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"

     

       115
       116
        
           ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent"

     

       116
       116
       -
           ++ lib.optional enableDebuginfod "--with-debuginfod=yes";

     

       117
       117
       +
           ++ lib.optional enableDebuginfod "--with-debuginfod=yes"

     

       118
       118
       +
           ++ lib.optional (!enableSim) "--disable-sim";

     

       117
       119
        
       

     

       118
       120
        
         postInstall =

     

       119
       121
        
           '' # Remove Info files already provided by Binutils and other packages.

+14 -2

pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix

···

       1
       1
       -
       { lib, appleDerivation, xcbuild, ncurses, libutil, Libc }:

     

       1
       1
       +
       { stdenv, lib, appleDerivation, xcbuild, ncurses, libutil, Libc }:

     

       2
       2
        
       

     

       3
       3
       +
       let

     

       4
       4
       +
         # Libc conflicts with libc++ 16, so provide only the header from it that’s needed to build.

     

       5
       5
       +
         msgcat = stdenv.mkDerivation {

     

       6
       6
       +
           pname = "Libc-msgcat";

     

       7
       7
       +
           version = lib.getVersion Libc;

     

       8
       8
       +
       

     

       9
       9
       +
           buildCommand = ''

     

       10
       10
       +
             mkdir -p "$out/include"

     

       11
       11
       +
             ln -s ${lib.getDev Libc}/include/msgcat.h "$out/include/"

     

       12
       12
       +
           '';

     

       13
       13
       +
         };

     

       14
       14
       +
       in

     

       3
       15
        
       appleDerivation {

     

       4
       16
        
         # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264

     

       5
       17
        
       

     
···

       44
       56
        
         '';

     

       45
       57
        
       

     

       46
       58
        
         nativeBuildInputs = [ xcbuild ];

     

       47
       47
       -
         buildInputs = [ ncurses libutil Libc ];

     

       59
       59
       +
         buildInputs = [ ncurses libutil msgcat ];

     

       48
       60
        
       

     

       49
       61
        
         meta = {

     

       50
       62
        
           platforms = lib.platforms.darwin;

+13

pkgs/os-specific/darwin/signing-utils/post-link-sign-hook.nix

···

       1
       1
       +
       { writeTextFile, cctools, sigtool }:

     

       2
       2
       +
       

     

       3
       3
       +
       writeTextFile {

     

       4
       4
       +
         name = "post-link-sign-hook";

     

       5
       5
       +
         executable = true;

     

       6
       6
       +
       

     

       7
       7
       +
         text = ''

     

       8
       8
       +
           if [ "$linkerOutput" != "/dev/null" ]; then

     

       9
       9
       +
             CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate \

     

       10
       10
       +
               ${sigtool}/bin/codesign -f -s - "$linkerOutput"

     

       11
       11
       +
           fi

     

       12
       12
       +
         '';

     

       13
       13
       +
       }

+4 -3

pkgs/os-specific/linux/kernel/common-config.nix

···

       36
       36
        
       

     

       37
       37
        
           debug = {

     

       38
       38
        
             # Necessary for BTF

     

       39
       39
       -
             DEBUG_INFO                = yes;

     

       39
       39
       +
             DEBUG_INFO                = mkMerge [

     

       40
       40
       +
               (whenOlder "5.2" (if (features.debug or false) then yes else no))

     

       41
       41
       +
               (whenBetween "5.2" "5.18" yes)

     

       42
       42
       +
             ];

     

       40
       43
        
             DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;

     

       41
       44
        
             # Reduced debug info conflict with BTF and have been enabled in

     

       42
       45
        
             # aarch64 defconfig since 5.13

     
···

       59
       62
        
             SUNRPC_DEBUG              = yes;

     

       60
       63
        
             # Provide access to tunables like sched_migration_cost_ns

     

       61
       64
        
             SCHED_DEBUG               = yes;

     

       62
       62
       -
       

     

       63
       63
       -
             GDB_SCRIPTS               = yes;

     

       64
       65
        
           };

     

       65
       66
        
       

     

       66
       67
        
           power-management = {

+6 -3

pkgs/os-specific/linux/kernel/generic.nix

···

       47
       47
        
         # symbolic name and `patch' is the actual patch.  The patch may

     

       48
       48
        
         # optionally be compressed with gzip or bzip2.

     

       49
       49
        
         kernelPatches ? []

     

       50
       50
       -
       , ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name or "" != "pc"

     

       50
       50
       +
       , ignoreConfigErrors ? stdenv.hostPlatform.linux-kernel.name != "pc"

     

       51
       51
        
       , extraMeta ? {}

     

       52
       52
        
       

     

       53
       53
        
       , isZen      ? false

     
···

       55
       55
        
       , isHardened ? false

     

       56
       56
        
       

     

       57
       57
        
       # easy overrides to stdenv.hostPlatform.linux-kernel members

     

       58
       58
       -
       , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true

     

       58
       58
       +
       , autoModules ? stdenv.hostPlatform.linux-kernel.autoModules

     

       59
       59
        
       , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false

     

       60
       60
        
       , kernelArch ? stdenv.hostPlatform.linuxArch

     

       61
       61
        
       , kernelTests ? []

     
···

       128
       128
        
             ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]

     

       129
       129
        
             ++ lib.optional (lib.versionAtLeast version "5.2") pahole;

     

       130
       130
        
       

     

       131
       131
       +
           platformName = stdenv.hostPlatform.linux-kernel.name;

     

       131
       132
        
           # e.g. "defconfig"

     

       132
       132
       -
           kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";

     

       133
       133
       +
           kernelBaseConfig = if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;

     

       134
       134
       +
           # e.g. "bzImage"

     

       135
       135
       +
           kernelTarget = stdenv.hostPlatform.linux-kernel.target;

     

       133
       136
        
       

     

       134
       137
        
           makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags

     

       135
       138
        
             ++ extraMakeFlags;

+270 -309

pkgs/os-specific/linux/kernel/manual-config.nix

···

       1
       1
        
       { lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl

     

       2
       2
       -
       , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole, ubootTools

     

       2
       2
       +
       , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole

     

       3
       3
        
       , fetchpatch

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       53
       53
        
       }:

     

       54
       54
        
       

     

       55
       55
        
       let

     

       56
       56
       -
         config_ = config;

     

       57
       57
       -
       in

     

       58
       58
       -
       

     

       59
       59
       -
       let

     

       60
       56
        
         inherit (lib)

     

       61
       57
        
           hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms;

     

       62
       58
        
       

     
···

       69
       65
        
           (buildPackages.deterministic-uname.override { inherit modDirVersion; })

     

       70
       66
        
         ] ++ optional (lib.versionAtLeast version "5.13") zstd;

     

       71
       67
        
       

     

       72
       72
       -
         config = let attrName = attr: "CONFIG_" + attr; in {

     

       73
       73
       -
           isSet = attr: hasAttr (attrName attr) config;

     

       68
       68
       +
         drvAttrs = config_: kernelConf: kernelPatches: configfile:

     

       69
       69
       +
           let

     

       70
       70
       +
             config = let attrName = attr: "CONFIG_" + attr; in {

     

       71
       71
       +
               isSet = attr: hasAttr (attrName attr) config;

     

       74
       72
        
       

     

       75
       75
       -
           getValue = attr: if config.isSet attr then getAttr (attrName attr) config else null;

     

       73
       73
       +
               getValue = attr: if config.isSet attr then getAttr (attrName attr) config else null;

     

       76
       74
        
       

     

       77
       77
       -
           isYes = attr: (config.getValue attr) == "y";

     

       75
       75
       +
               isYes = attr: (config.getValue attr) == "y";

     

       78
       76
        
       

     

       79
       79
       -
           isNo = attr: (config.getValue attr) == "n";

     

       77
       77
       +
               isNo = attr: (config.getValue attr) == "n";

     

       80
       78
        
       

     

       81
       81
       -
           isModule = attr: (config.getValue attr) == "m";

     

       79
       79
       +
               isModule = attr: (config.getValue attr) == "m";

     

       82
       80
        
       

     

       83
       83
       -
           isEnabled = attr: (config.isModule attr) || (config.isYes attr);

     

       81
       81
       +
               isEnabled = attr: (config.isModule attr) || (config.isYes attr);

     

       84
       82
        
       

     

       85
       85
       -
           isDisabled = attr: (!(config.isSet attr)) || (config.isNo attr);

     

       86
       86
       -
         } // config_;

     

       83
       83
       +
               isDisabled = attr: (!(config.isSet attr)) || (config.isNo attr);

     

       84
       84
       +
             } // config_;

     

       87
       85
        
       

     

       88
       88
       -
         isModular = config.isYes "MODULES";

     

       86
       86
       +
             isModular = config.isYes "MODULES";

     

       89
       87
        
       

     

       90
       90
       -
         kernelConf = stdenv.hostPlatform.linux-kernel;

     

       91
       91
       -
         target = kernelConf.target or "vmlinux";

     

       88
       88
       +
             buildDTBs = kernelConf.DTB or false;

     

       92
       89
        
       

     

       93
       93
       -
         buildDTBs = kernelConf.DTB or false;

     

       94
       94
       -
       in

     

       90
       90
       +
           in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {

     

       91
       91
       +
             passthru = rec {

     

       92
       92
       +
               inherit version modDirVersion config kernelPatches configfile

     

       93
       93
       +
                 moduleBuildDependencies stdenv;

     

       94
       94
       +
               inherit isZen isHardened isLibre;

     

       95
       95
       +
               isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;

     

       96
       96
       +
               baseVersion = lib.head (lib.splitString "-rc" version);

     

       97
       97
       +
               kernelOlder = lib.versionOlder baseVersion;

     

       98
       98
       +
               kernelAtLeast = lib.versionAtLeast baseVersion;

     

       99
       99
       +
             };

     

       95
       100
        
       

     

       96
       96
       -
       assert lib.versionOlder version "5.8" -> libelf != null;

     

       97
       97
       -
       assert lib.versionAtLeast version "5.8" -> elfutils != null;

     

       101
       101
       +
             inherit src;

     

       98
       102
        
       

     

       99
       99
       -
       stdenv.mkDerivation ({

     

       100
       100
       -
         pname = "linux";

     

       101
       101
       -
         inherit version src;

     

       103
       103
       +
             patches =

     

       104
       104
       +
               map (p: p.patch) kernelPatches

     

       105
       105
       +
               # Required for deterministic builds along with some postPatch magic.

     

       106
       106
       +
               ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch

     

       107
       107
       +
               ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch

     

       108
       108
       +
               # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks

     

       109
       109
       +
               # OpenZFS; this was fixed in Linux 5.19 so we backport the fix

     

       110
       110
       +
               # https://github.com/openzfs/zfs/pull/13367

     

       111
       111
       +
               ++ optional (lib.versionAtLeast version "5.12" &&

     

       112
       112
       +
                            lib.versionOlder version "5.19" &&

     

       113
       113
       +
                            stdenv.hostPlatform.isPower)

     

       114
       114
       +
                 (fetchpatch {

     

       115
       115
       +
                   url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";

     

       116
       116
       +
                   hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";

     

       117
       117
       +
                 });

     

       102
       118
        
       

     

       103
       103
       -
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       104
       104
       -
         nativeBuildInputs = [

     

       105
       105
       -
           bc gmp libmpc mpfr nettools openssl perl python3Minimal rsync ubootTools

     

       106
       106
       -
           zstd

     

       107
       107
       -
         ] ++ optional  (lib.versionOlder version "5.8") libelf

     

       108
       108
       -
           ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]

     

       109
       109
       -
           ++ optionals (lib.versionAtLeast version "5.2")  [ cpio pahole zlib ]

     

       110
       110
       -
           ++ optional  (lib.versionAtLeast version "5.8")  elfutils;

     

       119
       119
       +
             postPatch = ''

     

       120
       120
       +
               sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'

     

       111
       121
        
       

     

       112
       112
       -
         patches =

     

       113
       113
       -
           map (p: p.patch) kernelPatches

     

       114
       114
       -
           # Required for deterministic builds along with some postPatch magic.

     

       115
       115
       -
           ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch

     

       116
       116
       -
           ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch

     

       117
       117
       -
           # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks

     

       118
       118
       -
           # OpenZFS; this was fixed in Linux 5.19 so we backport the fix

     

       119
       119
       -
           # https://github.com/openzfs/zfs/pull/13367

     

       120
       120
       -
           ++ optional (lib.versionAtLeast version "5.12" &&

     

       121
       121
       -
                        lib.versionOlder version "5.19" &&

     

       122
       122
       -
                        stdenv.hostPlatform.isPower)

     

       123
       123
       -
             (fetchpatch {

     

       124
       124
       -
               url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";

     

       125
       125
       -
               hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";

     

       126
       126
       -
             });

     

       122
       122
       +
               # fixup for pre-5.4 kernels using the $(cd $foo && /bin/pwd) pattern

     

       123
       123
       +
               # FIXME: remove when no longer needed

     

       124
       124
       +
               substituteInPlace Makefile tools/scripts/Makefile.include --replace /bin/pwd pwd

     

       127
       125
        
       

     

       128
       128
       -
         preUnpack = ''

     

       129
       129
       -
           # The same preUnpack is used to build the configfile,

     

       130
       130
       -
           # which does not have $dev.

     

       131
       131
       -
           if [ -n "$dev" ]; then

     

       132
       132
       -
               mkdir -p $dev/lib/modules/${modDirVersion}

     

       133
       133
       -
               cd $dev/lib/modules/${modDirVersion}

     

       134
       134
       -
           fi

     

       135
       135
       -
         '';

     

       126
       126
       +
               # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic.

     

       127
       127
       +
               # This way kernels can be bit-by-bit reproducible depending on settings

     

       128
       128
       +
               # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled).

     

       129
       129
       +
               # See also https://kernelnewbies.org/BuildId

     

       130
       130
       +
               sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|'

     

       136
       131
        
       

     

       137
       137
       -
         postUnpack = ''

     

       138
       138
       -
           mv -Tv "$sourceRoot" source 2>/dev/null || :

     

       139
       139
       -
           export sourceRoot=$PWD/source

     

       140
       140
       -
         '';

     

       132
       132
       +
               # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist.

     

       133
       133
       +
               [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh

     

       141
       134
        
       

     

       142
       142
       -
         postPatch = ''

     

       143
       143
       -
           sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'

     

       135
       135
       +
               # Set randstruct seed to a deterministic but diversified value. Note:

     

       136
       136
       +
               # we could have instead patched gen-random-seed.sh to take input from

     

       137
       137
       +
               # the buildFlags, but that would require also patching the kernel's

     

       138
       138
       +
               # toplevel Makefile to add a variable export. This would be likely to

     

       139
       139
       +
               # cause future patch conflicts.

     

       140
       140
       +
               for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do

     

       141
       141
       +
                 if [ -f "$file" ]; then

     

       142
       142
       +
                   substituteInPlace "$file" \

     

       143
       143
       +
                     --replace NIXOS_RANDSTRUCT_SEED \

     

       144
       144
       +
                     $(echo ${randstructSeed}${src} ${placeholder "configfile"} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')

     

       145
       145
       +
                   break

     

       146
       146
       +
                 fi

     

       147
       147
       +
               done

     

       144
       148
        
       

     

       145
       145
       -
           # fixup for pre-4.15 kernels using the $(cd $foo && /bin/pwd) pattern

     

       146
       146
       -
           # FIXME: remove when no longer needed

     

       147
       147
       -
           substituteInPlace Makefile tools/scripts/Makefile.include --replace /bin/pwd pwd

     

       149
       149
       +
               patchShebangs scripts

     

       148
       150
        
       

     

       149
       149
       -
           # Don't include a (random) NT_GNU_BUILD_ID, to make the build more deterministic.

     

       150
       150
       -
           # This way kernels can be bit-by-bit reproducible depending on settings

     

       151
       151
       -
           # (e.g. MODULE_SIG and SECURITY_LOCKDOWN_LSM need to be disabled).

     

       152
       152
       -
           # See also https://kernelnewbies.org/BuildId

     

       153
       153
       -
           sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|'

     

       151
       151
       +
               # also patch arch-specific install scripts

     

       152
       152
       +
               for i in $(find arch -name install.sh); do

     

       153
       153
       +
                   patchShebangs "$i"

     

       154
       154
       +
               done

     

       155
       155
       +
             '';

     

       154
       156
        
       

     

       155
       155
       -
           # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist.

     

       156
       156
       -
           [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh

     

       157
       157
       +
             configurePhase = ''

     

       158
       158
       +
               runHook preConfigure

     

       157
       159
        
       

     

       158
       158
       -
           # Set randstruct seed to a deterministic but diversified value. Note:

     

       159
       159
       -
           # we could have instead patched gen-random-seed.sh to take input from

     

       160
       160
       -
           # the buildFlags, but that would require also patching the kernel's

     

       161
       161
       -
           # toplevel Makefile to add a variable export. This would be likely to

     

       162
       162
       -
           # cause future patch conflicts.

     

       163
       163
       -
           for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do

     

       164
       164
       -
             if [ -f "$file" ]; then

     

       165
       165
       -
               substituteInPlace "$file" \

     

       166
       166
       -
                 --replace NIXOS_RANDSTRUCT_SEED \

     

       167
       167
       -
                 $(echo ${randstructSeed}${src} ${placeholder "configfile"} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')

     

       168
       168
       -
               break

     

       169
       169
       -
             fi

     

       170
       170
       -
           done

     

       160
       160
       +
               mkdir build

     

       161
       161
       +
               export buildRoot="$(pwd)/build"

     

       171
       162
        
       

     

       172
       172
       -
           patchShebangs scripts

     

       163
       163
       +
               echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"

     

       173
       164
        
       

     

       174
       174
       -
           # also patch arch-specific install scripts

     

       175
       175
       -
           for i in $(find arch -name install.sh); do

     

       176
       176
       -
               patchShebangs "$i"

     

       177
       177
       -
           done

     

       178
       178
       -
         '';

     

       165
       165
       +
               if [ -f "$buildRoot/.config" ]; then

     

       166
       166
       +
                 echo "Could not link $buildRoot/.config : file exists"

     

       167
       167
       +
                 exit 1

     

       168
       168
       +
               fi

     

       169
       169
       +
               ln -sv ${configfile} $buildRoot/.config

     

       179
       170
        
       

     

       180
       180
       -
         configurePhase = ''

     

       181
       181
       -
           runHook preConfigure

     

       171
       171
       +
               # reads the existing .config file and prompts the user for options in

     

       172
       172
       +
               # the current kernel source that are not found in the file.

     

       173
       173
       +
               make $makeFlags "''${makeFlagsArray[@]}" oldconfig

     

       174
       174
       +
               runHook postConfigure

     

       182
       175
        
       

     

       183
       183
       -
           export buildRoot=$TMPDIR/kernel-buildroot

     

       184
       184
       -
           mkdir -p $buildRoot

     

       176
       176
       +
               make $makeFlags "''${makeFlagsArray[@]}" prepare

     

       177
       177
       +
               actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"

     

       178
       178
       +
               if [ "$actualModDirVersion" != "${modDirVersion}" ]; then

     

       179
       179
       +
                 echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"

     

       180
       180
       +
                 exit 1

     

       181
       181
       +
               fi

     

       185
       182
        
       

     

       186
       186
       -
           echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"

     

       183
       183
       +
               buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")

     

       187
       184
        
       

     

       188
       188
       -
           if [ -f "$buildRoot/.config" ]; then

     

       189
       189
       -
             echo "Could not link $buildRoot/.config : file exists"

     

       190
       190
       -
             exit 1

     

       191
       191
       -
           fi

     

       192
       192
       -
           ln -sv ${configfile} $buildRoot/.config

     

       185
       185
       +
               cd $buildRoot

     

       186
       186
       +
             '';

     

       193
       187
        
       

     

       194
       194
       -
           # reads the existing .config file and prompts the user for options in

     

       195
       195
       -
           # the current kernel source that are not found in the file.

     

       196
       196
       -
           make $makeFlags "''${makeFlagsArray[@]}" oldconfig

     

       197
       197
       -
           runHook postConfigure

     

       188
       188
       +
             buildFlags = [

     

       189
       189
       +
               "KBUILD_BUILD_VERSION=1-NixOS"

     

       190
       190
       +
               kernelConf.target

     

       191
       191
       +
               "vmlinux"  # for "perf" and things like that

     

       192
       192
       +
             ] ++ optional isModular "modules"

     

       193
       193
       +
               ++ optionals buildDTBs ["dtbs" "DTC_FLAGS=-@"]

     

       194
       194
       +
             ++ extraMakeFlags;

     

       198
       195
        
       

     

       199
       199
       -
           make $makeFlags "''${makeFlagsArray[@]}" prepare

     

       200
       200
       -
           actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"

     

       201
       201
       -
           if [ "$actualModDirVersion" != "${modDirVersion}" ]; then

     

       202
       202
       -
             echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"

     

       203
       203
       -
             exit 1

     

       204
       204
       -
           fi

     

       196
       196
       +
             installFlags = [

     

       197
       197
       +
               "INSTALL_PATH=$(out)"

     

       198
       198
       +
             ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)")

     

       199
       199
       +
             ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"];

     

       205
       200
        
       

     

       206
       206
       -
           buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")

     

       201
       201
       +
             preInstall = let

     

       202
       202
       +
               # All we really need to do here is copy the final image and System.map to $out,

     

       203
       203
       +
               # and use the kernel's modules_install, firmware_install, dtbs_install, etc. targets

     

       204
       204
       +
               # for the rest. Easy, right?

     

       205
       205
       +
               #

     

       206
       206
       +
               # Unfortunately for us, the obvious way of getting the built image path,

     

       207
       207
       +
               # make -s image_name, does not work correctly, because some architectures

     

       208
       208
       +
               # (*cough* aarch64 *cough*) change KBUILD_IMAGE on the fly in their install targets,

     

       209
       209
       +
               # so we end up attempting to install the thing we didn't actually build.

     

       210
       210
       +
               #

     

       211
       211
       +
               # Thankfully, there's a way out that doesn't involve just hardcoding everything.

     

       212
       212
       +
               #

     

       213
       213
       +
               # The kernel has an install target, which runs a pretty simple shell script

     

       214
       214
       +
               # (located at scripts/install.sh or arch/$arch/boot/install.sh, depending on

     

       215
       215
       +
               # which kernel version you're looking at) that tries to do something sensible.

     

       216
       216
       +
               #

     

       217
       217
       +
               # (it would be great to hijack this script immediately, as it has all the

     

       218
       218
       +
               #   information we need passed to it and we don't need it to try and be smart,

     

       219
       219
       +
               #   but unfortunately, the exact location of the scripts differs between kernel

     

       220
       220
       +
               #   versions, and they're seemingly not considered to be public API at all)

     

       221
       221
       +
               #

     

       222
       222
       +
               # One of the ways it tries to discover what "something sensible" actually is

     

       223
       223
       +
               # is by delegating to what's supposed to be a user-provided install script

     

       224
       224
       +
               # located at ~/bin/installkernel.

     

       225
       225
       +
               #

     

       226
       226
       +
               # (the other options are:

     

       227
       227
       +
               #   - a distribution-specific script at /sbin/installkernel,

     

       228
       228
       +
               #        which we can't really create in the sandbox easily

     

       229
       229
       +
               #   - an architecture-specific script at arch/$arch/boot/install.sh,

     

       230
       230
       +
               #        which attempts to guess _something_ and usually guesses very wrong)

     

       231
       231
       +
               #

     

       232
       232
       +
               # More specifically, the install script exec's into ~/bin/installkernel, if one

     

       233
       233
       +
               # exists, with the following arguments:

     

       234
       234
       +
               #

     

       235
       235
       +
               # $1: $KERNELRELEASE - full kernel version string

     

       236
       236
       +
               # $2: $KBUILD_IMAGE - the final image path

     

       237
       237
       +
               # $3: System.map - path to System.map file, seemingly hardcoded everywhere

     

       238
       238
       +
               # $4: $INSTALL_PATH - path to the destination directory as specified in installFlags

     

       239
       239
       +
               #

     

       240
       240
       +
               # $2 is exactly what we want, so hijack the script and use the knowledge given to it

     

       241
       241
       +
               # by the makefile overlords for our own nefarious ends.

     

       242
       242
       +
               #

     

       243
       243
       +
               # Note that the makefiles specifically look in ~/bin/installkernel, and

     

       244
       244
       +
               # writeShellScriptBin writes the script to <store path>/bin/installkernel,

     

       245
       245
       +
               # so HOME needs to be set to just the store path.

     

       246
       246
       +
               #

     

       247
       247
       +
               # FIXME: figure out a less roundabout way of doing this.

     

       248
       248
       +
               installkernel = buildPackages.writeShellScriptBin "installkernel" ''

     

       249
       249
       +
                 cp -av $2 $4

     

       250
       250
       +
                 cp -av $3 $4

     

       251
       251
       +
               '';

     

       252
       252
       +
             in ''

     

       253
       253
       +
               installFlagsArray+=("-j$NIX_BUILD_CORES")

     

       254
       254
       +
               export HOME=${installkernel}

     

       255
       255
       +
             '';

     

       207
       256
        
       

     

       208
       208
       -
           cd $buildRoot

     

       209
       209
       -
         '';

     

       257
       257
       +
             # Some image types need special install targets (e.g. uImage is installed with make uinstall)

     

       258
       258
       +
             installTargets = [

     

       259
       259
       +
               (kernelConf.installTarget or (

     

       260
       260
       +
                 /**/ if kernelConf.target == "uImage" then "uinstall"

     

       261
       261
       +
                 else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"

     

       262
       262
       +
                 else "install"))

     

       263
       263
       +
             ];

     

       210
       264
        
       

     

       211
       211
       -
         hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];

     

       265
       265
       +
             postInstall = optionalString isModular ''

     

       266
       266
       +
               mkdir -p $dev

     

       267
       267
       +
               cp vmlinux $dev/

     

       268
       268
       +
               if [ -z "''${dontStrip-}" ]; then

     

       269
       269
       +
                 installFlagsArray+=("INSTALL_MOD_STRIP=1")

     

       270
       270
       +
               fi

     

       271
       271
       +
               make modules_install $makeFlags "''${makeFlagsArray[@]}" \

     

       272
       272
       +
                 $installFlags "''${installFlagsArray[@]}"

     

       273
       273
       +
               unlink $out/lib/modules/${modDirVersion}/build

     

       274
       274
       +
               unlink $out/lib/modules/${modDirVersion}/source

     

       212
       275
        
       

     

       213
       213
       -
         # Absolute paths for compilers avoid any PATH-clobbering issues.

     

       214
       214
       -
         makeFlags = [

     

       215
       215
       -
           "O=$(buildRoot)"

     

       216
       216
       -
           "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"

     

       217
       217
       -
           "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"

     

       218
       218
       -
           "HOSTLD=${buildPackages.stdenv.cc.bintools}/bin/${buildPackages.stdenv.cc.targetPrefix}ld"

     

       219
       219
       -
           "ARCH=${stdenv.hostPlatform.linuxArch}"

     

       220
       220
       -
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       221
       221
       -
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

     

       222
       222
       -
         ] ++ (kernelConf.makeFlags or [])

     

       223
       223
       -
           ++ extraMakeFlags;

     

       276
       276
       +
               mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}

     

       224
       277
        
       

     

       225
       225
       -
         karch = stdenv.hostPlatform.linuxArch;

     

       278
       278
       +
               # To save space, exclude a bunch of unneeded stuff when copying.

     

       279
       279
       +
               (cd .. && rsync --archive --prune-empty-dirs \

     

       280
       280
       +
                   --exclude='/build/' \

     

       281
       281
       +
                   * $dev/lib/modules/${modDirVersion}/source/)

     

       226
       282
        
       

     

       227
       227
       -
         buildFlags = [

     

       228
       228
       -
           "DTC_FLAGS=-@"

     

       229
       229
       -
           "KBUILD_BUILD_VERSION=1-NixOS"

     

       283
       283
       +
               cd $dev/lib/modules/${modDirVersion}/source

     

       230
       284
        
       

     

       231
       231
       -
           # Set by default in the kernel since a73619a845d5,

     

       232
       232
       -
           # replicated here to apply to older versions.

     

       233
       233
       -
           # Makes __FILE__ relative to the build directory.

     

       234
       234
       -
           "KCPPFLAGS=-fmacro-prefix-map=$(sourceRoot)/="

     

       235
       235
       -
           kernelConf.target

     

       236
       236
       -
         ] ++ optional isModular "modules"

     

       237
       237
       -
           ++ optional buildDTBs "dtbs"

     

       238
       238
       -
           ++ extraMakeFlags;

     

       285
       285
       +
               cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build

     

       286
       286
       +
               make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build

     

       239
       287
        
       

     

       240
       240
       -
         installFlags = [

     

       241
       241
       -
           "INSTALL_PATH=$(out)"

     

       242
       242
       -
         ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)")

     

       243
       243
       -
         ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"];

     

       288
       288
       +
               # For reproducibility, removes accidental leftovers from a `cc1` call

     

       289
       289
       +
               # from a `try-run` call from the Makefile

     

       290
       290
       +
               rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d

     

       244
       291
        
       

     

       245
       245
       -
         preInstall = let

     

       246
       246
       -
           # All we really need to do here is copy the final image and System.map to $out,

     

       247
       247
       -
           # and use the kernel's modules_install, firmware_install, dtbs_install, etc. targets

     

       248
       248
       -
           # for the rest. Easy, right?

     

       249
       249
       -
           #

     

       250
       250
       -
           # Unfortunately for us, the obvious way of getting the built image path,

     

       251
       251
       -
           # make -s image_name, does not work correctly, because some architectures

     

       252
       252
       -
           # (*cough* aarch64 *cough*) change KBUILD_IMAGE on the fly in their install targets,

     

       253
       253
       -
           # so we end up attempting to install the thing we didn't actually build.

     

       254
       254
       -
           #

     

       255
       255
       -
           # Thankfully, there's a way out that doesn't involve just hardcoding everything.

     

       256
       256
       -
           #

     

       257
       257
       -
           # The kernel has an install target, which runs a pretty simple shell script

     

       258
       258
       -
           # (located at scripts/install.sh or arch/$arch/boot/install.sh, depending on

     

       259
       259
       -
           # which kernel version you're looking at) that tries to do something sensible.

     

       260
       260
       -
           #

     

       261
       261
       -
           # (it would be great to hijack this script immediately, as it has all the

     

       262
       262
       -
           #   information we need passed to it and we don't need it to try and be smart,

     

       263
       263
       -
           #   but unfortunately, the exact location of the scripts differs between kernel

     

       264
       264
       -
           #   versions, and they're seemingly not considered to be public API at all)

     

       265
       265
       -
           #

     

       266
       266
       -
           # One of the ways it tries to discover what "something sensible" actually is

     

       267
       267
       -
           # is by delegating to what's supposed to be a user-provided install script

     

       268
       268
       -
           # located at ~/bin/installkernel.

     

       269
       269
       -
           #

     

       270
       270
       -
           # (the other options are:

     

       271
       271
       -
           #   - a distribution-specific script at /sbin/installkernel,

     

       272
       272
       -
           #        which we can't really create in the sandbox easily

     

       273
       273
       -
           #   - an architecture-specific script at arch/$arch/boot/install.sh,

     

       274
       274
       -
           #        which attempts to guess _something_ and usually guesses very wrong)

     

       275
       275
       -
           #

     

       276
       276
       -
           # More specifically, the install script exec's into ~/bin/installkernel, if one

     

       277
       277
       -
           # exists, with the following arguments:

     

       278
       278
       -
           #

     

       279
       279
       -
           # $1: $KERNELRELEASE - full kernel version string

     

       280
       280
       -
           # $2: $KBUILD_IMAGE - the final image path

     

       281
       281
       -
           # $3: System.map - path to System.map file, seemingly hardcoded everywhere

     

       282
       282
       -
           # $4: $INSTALL_PATH - path to the destination directory as specified in installFlags

     

       283
       283
       -
           #

     

       284
       284
       -
           # $2 is exactly what we want, so hijack the script and use the knowledge given to it

     

       285
       285
       -
           # by the makefile overlords for our own nefarious ends.

     

       286
       286
       -
           #

     

       287
       287
       -
           # Note that the makefiles specifically look in ~/bin/installkernel, and

     

       288
       288
       -
           # writeShellScriptBin writes the script to <store path>/bin/installkernel,

     

       289
       289
       -
           # so HOME needs to be set to just the store path.

     

       290
       290
       -
           #

     

       291
       291
       -
           # FIXME: figure out a less roundabout way of doing this.

     

       292
       292
       -
           installkernel = buildPackages.writeShellScriptBin "installkernel" ''

     

       293
       293
       -
             cp -av $2 $4

     

       294
       294
       -
             cp -av $3 $4

     

       295
       295
       -
           '';

     

       296
       296
       -
         in ''

     

       297
       297
       -
           installFlagsArray+=("-j$NIX_BUILD_CORES")

     

       298
       298
       -
           export HOME=${installkernel}

     

       299
       299
       -
         '';

     

       292
       292
       +
               # Keep some extra files on some arches (powerpc, aarch64)

     

       293
       293
       +
               for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do

     

       294
       294
       +
                 if [ -f "$buildRoot/$f" ]; then

     

       295
       295
       +
                   cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f

     

       296
       296
       +
                 fi

     

       297
       297
       +
               done

     

       300
       298
        
       

     

       301
       301
       -
         # Some image types need special install targets (e.g. uImage is installed with make uinstall)

     

       302
       302
       -
         installTargets = [

     

       303
       303
       -
           (kernelConf.installTarget or (

     

       304
       304
       -
             /**/ if target == "uImage" then "uinstall"

     

       305
       305
       -
             else if target == "zImage" || target == "Image.gz" then "zinstall"

     

       306
       306
       -
             else "install"))

     

       307
       307
       -
         ];

     

       299
       299
       +
               # !!! No documentation on how much of the source tree must be kept

     

       300
       300
       +
               # If/when kernel builds fail due to missing files, you can add

     

       301
       301
       +
               # them here. Note that we may see packages requiring headers

     

       302
       302
       +
               # from drivers/ in the future; it adds 50M to keep all of its

     

       303
       303
       +
               # headers on 3.10 though.

     

       308
       304
        
       

     

       309
       309
       -
         postInstall = optionalString isModular ''

     

       310
       310
       -
           if [ -z "''${dontStrip-}" ]; then

     

       311
       311
       -
             installFlagsArray+=("INSTALL_MOD_STRIP=1")

     

       312
       312
       -
           fi

     

       313
       313
       -
           make modules_install $makeFlags "''${makeFlagsArray[@]}" \

     

       314
       314
       -
             $installFlags "''${installFlagsArray[@]}"

     

       315
       315
       -
           unlink $out/lib/modules/${modDirVersion}/build

     

       316
       316
       -
           unlink $out/lib/modules/${modDirVersion}/source

     

       305
       305
       +
               chmod u+w -R ..

     

       306
       306
       +
               arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls)

     

       317
       307
        
       

     

       318
       318
       -
           mkdir $dev/lib/modules/${modDirVersion}/build

     

       308
       308
       +
               # Remove unused arches

     

       309
       309
       +
               for d in $(cd arch/; ls); do

     

       310
       310
       +
                 if [ "$d" = "$arch" ]; then continue; fi

     

       311
       311
       +
                 if [ "$arch" = arm64 ] && [ "$d" = arm ]; then continue; fi

     

       312
       312
       +
                 rm -rf arch/$d

     

       313
       313
       +
               done

     

       319
       314
        
       

     

       320
       320
       -
           cd $dev/lib/modules/${modDirVersion}/source

     

       315
       315
       +
               # Remove all driver-specific code (50M of which is headers)

     

       316
       316
       +
               rm -fR drivers

     

       321
       317
        
       

     

       322
       322
       -
           cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build

     

       323
       323
       -
           make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build

     

       318
       318
       +
               # Keep all headers

     

       319
       319
       +
               find .  -type f -name '*.h' -print0 | xargs -0 -r chmod u-w

     

       324
       320
        
       

     

       325
       325
       -
           # For reproducibility, removes accidental leftovers from a `cc1` call

     

       326
       326
       -
           # from a `try-run` call from the Makefile

     

       327
       327
       -
           rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d

     

       321
       321
       +
               # Keep linker scripts (they are required for out-of-tree modules on aarch64)

     

       322
       322
       +
               find .  -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w

     

       328
       323
        
       

     

       329
       329
       -
           # Keep some extra files

     

       330
       330
       -
           for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o \

     

       331
       331
       -
                    scripts/gdb/linux vmlinux vmlinux-gdb.py

     

       332
       332
       -
           do

     

       333
       333
       -
             if [ -e "$buildRoot/$f" ]; then

     

       334
       334
       -
               mkdir -p "$(dirname "$dev/lib/modules/${modDirVersion}/build/$f")"

     

       335
       335
       -
               cp -HR $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f

     

       336
       336
       -
             fi

     

       337
       337
       -
           done

     

       338
       338
       -
           ln -s $dev/lib/modules/${modDirVersion}/build/vmlinux $dev

     

       324
       324
       +
               # Keep root and arch-specific Makefiles

     

       325
       325
       +
               chmod u-w Makefile arch/"$arch"/Makefile*

     

       339
       326
        
       

     

       340
       340
       -
           # !!! No documentation on how much of the source tree must be kept

     

       341
       341
       -
           # If/when kernel builds fail due to missing files, you can add

     

       342
       342
       -
           # them here. Note that we may see packages requiring headers

     

       343
       343
       -
           # from drivers/ in the future; it adds 50M to keep all of its

     

       344
       344
       -
           # headers on 3.10 though.

     

       345
       345
       -
       

     

       346
       346
       -
           chmod u+w -R ..

     

       347
       347
       -
           arch=$(cd $dev/lib/modules/${modDirVersion}/build/arch; ls)

     

       348
       348
       -
       

     

       349
       349
       -
           # Remove unused arches

     

       350
       350
       -
           for d in $(cd arch/; ls); do

     

       351
       351
       -
             if [ "$d" = "$arch" ]; then continue; fi

     

       352
       352
       -
             if [ "$arch" = arm64 ] && [ "$d" = arm ]; then continue; fi

     

       353
       353
       -
             rm -rf arch/$d

     

       354
       354
       -
           done

     

       355
       355
       -
       

     

       356
       356
       -
           # Remove all driver-specific code (50M of which is headers)

     

       357
       357
       -
           rm -fR drivers

     

       358
       358
       -
       

     

       359
       359
       -
           # Keep all headers

     

       360
       360
       -
           find .  -type f -name '*.h' -print0 | xargs -0 -r chmod u-w

     

       327
       327
       +
               # Keep whole scripts dir

     

       328
       328
       +
               chmod u-w -R scripts

     

       361
       329
        
       

     

       362
       362
       -
           # Keep linker scripts (they are required for out-of-tree modules on aarch64)

     

       363
       363
       -
           find .  -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w

     

       330
       330
       +
               # Delete everything not kept

     

       331
       331
       +
               find . -type f -perm -u=w -print0 | xargs -0 -r rm

     

       364
       332
        
       

     

       365
       365
       -
           # Keep root and arch-specific Makefiles

     

       366
       366
       -
           chmod u-w Makefile arch/"$arch"/Makefile*

     

       333
       333
       +
               # Delete empty directories

     

       334
       334
       +
               find -empty -type d -delete

     

       367
       335
        
       

     

       368
       368
       -
           # Keep whole scripts dir

     

       369
       369
       -
           chmod u-w -R scripts

     

       336
       336
       +
               # Remove reference to kmod

     

       337
       337
       +
               sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|'

     

       338
       338
       +
             '';

     

       370
       339
        
       

     

       371
       371
       -
           # Delete everything not kept

     

       372
       372
       -
           find . -type f -perm -u=w -print0 | xargs -0 -r rm

     

       340
       340
       +
             requiredSystemFeatures = [ "big-parallel" ];

     

       373
       341
        
       

     

       374
       374
       -
           # Delete empty directories

     

       375
       375
       -
           find -empty -type d -delete

     

       342
       342
       +
             meta = {

     

       343
       343
       +
               description =

     

       344
       344
       +
                 "The Linux kernel" +

     

       345
       345
       +
                 (if kernelPatches == [] then "" else

     

       346
       346
       +
                   " (with patches: "

     

       347
       347
       +
                   + lib.concatStringsSep ", " (map (x: x.name) kernelPatches)

     

       348
       348
       +
                   + ")");

     

       349
       349
       +
               license = lib.licenses.gpl2Only;

     

       350
       350
       +
               homepage = "https://www.kernel.org/";

     

       351
       351
       +
               maintainers = lib.teams.linux-kernel.members ++ [

     

       352
       352
       +
                 maintainers.thoughtpolice

     

       353
       353
       +
               ];

     

       354
       354
       +
               platforms = platforms.linux;

     

       355
       355
       +
               timeout = 14400; # 4 hours

     

       356
       356
       +
             } // extraMeta;

     

       357
       357
       +
           };

     

       358
       358
       +
       in

     

       376
       359
        
       

     

       377
       377
       -
           # Remove reference to kmod

     

       378
       378
       -
           sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|'

     

       379
       379
       -
         ''

     

       380
       380
       -
         # unfortunately linux/arch/mips/Makefile does not understand installkernel

     

       381
       381
       -
         # and simply copies to $(INSTALL_PATH)/vmlinux-$(KERNELRELEASE)

     

       382
       382
       -
         + lib.optionalString stdenv.hostPlatform.isMips ''

     

       383
       383
       -
           mv $out/vmlinux-* $out/vmlinux || true

     

       384
       384
       -
           mv $out/vmlinuz-* $out/vmlinuz || true

     

       385
       385
       -
           mv $out/System.map-* $out/System.map

     

       386
       386
       -
         '';

     

       360
       360
       +
       assert lib.versionOlder version "5.8" -> libelf != null;

     

       361
       361
       +
       assert lib.versionAtLeast version "5.8" -> elfutils != null;

     

       387
       362
        
       

     

       388
       388
       -
         preFixup = ''

     

       389
       389
       -
           # Don't strip $dev/lib/modules/*/vmlinux

     

       390
       390
       -
           stripDebugList="$(cd $dev && echo lib/modules/*/build/*/)"

     

       391
       391
       -
         '' + lib.optionalString (stdenv.hostPlatform.isMips) ''

     

       392
       392
       -
           $STRIP -s $out/vmlinux || true

     

       393
       393
       -
         '';

     

       363
       363
       +
       stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // {

     

       364
       364
       +
         pname = "linux";

     

       365
       365
       +
         inherit version;

     

       394
       366
        
       

     

       395
       367
        
         enableParallelBuilding = true;

     

       396
       368
        
       

     

       397
       397
       -
         passthru = rec {

     

       398
       398
       -
           inherit version modDirVersion config kernelPatches configfile

     

       399
       399
       -
             moduleBuildDependencies stdenv;

     

       400
       400
       -
           inherit isZen isHardened isLibre;

     

       401
       401
       -
           isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;

     

       402
       402
       -
           baseVersion = lib.head (lib.splitString "-rc" version);

     

       403
       403
       -
           kernelOlder = lib.versionOlder baseVersion;

     

       404
       404
       -
           kernelAtLeast = lib.versionAtLeast baseVersion;

     

       405
       405
       -
         };

     

       369
       369
       +
         depsBuildBuild = [ buildPackages.stdenv.cc ];

     

       370
       370
       +
         nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ]

     

       371
       371
       +
             ++ optional  (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools

     

       372
       372
       +
             ++ optional  (lib.versionOlder version "5.8") libelf

     

       373
       373
       +
             ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]

     

       374
       374
       +
             ++ optionals (lib.versionAtLeast version "5.2")  [ cpio pahole zlib ]

     

       375
       375
       +
             ++ optional  (lib.versionAtLeast version "5.8")  elfutils

     

       376
       376
       +
             ;

     

       406
       377
        
       

     

       407
       407
       -
         requiredSystemFeatures = [ "big-parallel" ];

     

       378
       378
       +
         hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];

     

       408
       379
        
       

     

       409
       409
       -
         meta = {

     

       410
       410
       -
           description =

     

       411
       411
       -
             "The Linux kernel" +

     

       412
       412
       -
             (lib.optionalString (kernelPatches != []) (

     

       413
       413
       -
               " (with patches: "

     

       414
       414
       -
               + lib.concatStringsSep ", " (map (x: x.name) kernelPatches)

     

       415
       415
       -
               + ")"

     

       416
       416
       -
             ));

     

       417
       417
       -
           license = lib.licenses.gpl2Only;

     

       418
       418
       -
           homepage = "https://www.kernel.org/";

     

       419
       419
       -
           maintainers = lib.teams.linux-kernel.members ++ [

     

       420
       420
       -
             maintainers.thoughtpolice

     

       421
       421
       -
           ];

     

       422
       422
       -
           platforms = platforms.linux;

     

       423
       423
       -
           badPlatforms =

     

       424
       424
       -
             lib.optionals (lib.versionOlder version "4.15") [ "riscv32-linux" "riscv64-linux" ] ++

     

       425
       425
       -
             lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";

     

       426
       426
       -
           timeout = 14400; # 4 hours

     

       427
       427
       -
         } // extraMeta;

     

       428
       428
       -
       } // optionalAttrs (pos != null) {

     

       429
       429
       -
         inherit pos;

     

       430
       430
       -
       } // optionalAttrs isModular {

     

       431
       431
       -
         outputs = [ "out" "dev" ];

     

       432
       432
       -
       }))

     

       380
       380
       +
         # Absolute paths for compilers avoid any PATH-clobbering issues.

     

       381
       381
       +
         makeFlags = [

     

       382
       382
       +
           "O=$(buildRoot)"

     

       383
       383
       +
           "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"

     

       384
       384
       +
           "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"

     

       385
       385
       +
           "HOSTLD=${buildPackages.stdenv.cc.bintools}/bin/${buildPackages.stdenv.cc.targetPrefix}ld"

     

       386
       386
       +
           "ARCH=${stdenv.hostPlatform.linuxArch}"

     

       387
       387
       +
         ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

     

       388
       388
       +
           "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

     

       389
       389
       +
         ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or [])

     

       390
       390
       +
           ++ extraMakeFlags;

     

       391
       391
       +
       

     

       392
       392
       +
         karch = stdenv.hostPlatform.linuxArch;

     

       393
       393
       +
       } // (optionalAttrs (pos != null) { inherit pos; })))

+2

pkgs/servers/baserow/default.nix

···

       29
       29
        
       

     

       30
       30
        
               doCheck = false;

     

       31
       31
        
             };

     

       32
       32
       +
       

     

       33
       33
       +
             django = super.django_3;

     

       32
       34
        
           };

     

       33
       35
        
         };

     

       34
       36
        
       in

+2

pkgs/servers/mail/mailman/python.nix

···

       2
       2
        
       

     

       3
       3
        
       python3.override {

     

       4
       4
        
         packageOverrides = self: super: {

     

       5
       5
       +
           django = super.django_3;

     

       6
       6
       +
       

     

       5
       7
        
           # does not find tests

     

       6
       8
        
           alembic = super.alembic.overridePythonAttrs (oldAttrs: {

     

       7
       9
        
             doCheck = false;

+12 -10

pkgs/servers/sql/postgresql/default.nix

···

       307
       307
        
         };

     

       308
       308
        
       

     

       309
       309
        
         mkPackages = self: {

     

       310
       310
       +
           # TODO: remove ahead of 23.11 branchoff

     

       311
       311
       +
           # "PostgreSQL 11 will stop receiving fixes on November 9, 2023"

     

       310
       312
        
           postgresql_11 = self.callPackage generic {

     

       311
       311
       -
             version = "11.20";

     

       313
       313
       +
             version = "11.21";

     

       312
       314
        
             psqlSchema = "11.1"; # should be 11, but changing it is invasive

     

       313
       313
       -
             hash = "sha256-PXyIgvZKfphTSgRCV9/uerrXelt9oSUI2F1yK5i1rM4=";

     

       315
       315
       +
             hash = "sha256-B7CDdHHV3XeyUWazRxjzuhCBa2rWHmkeb8VHzz/P+FA=";

     

       314
       316
        
             this = self.postgresql_11;

     

       315
       317
        
             thisAttr = "postgresql_11";

     

       316
       318
        
             inherit self;

     

       317
       319
        
           };

     

       318
       320
        
       

     

       319
       321
        
           postgresql_12 = self.callPackage generic {

     

       320
       320
       -
             version = "12.15";

     

       322
       322
       +
             version = "12.16";

     

       321
       323
        
             psqlSchema = "12";

     

       322
       322
       -
             hash = "sha256-u1IG4oZMHEV5k4uW6mCW0VXyKr8tLMKqV1cePEyxKzY=";

     

       324
       324
       +
             hash = "sha256-xfH/96D5Ph7DdGQXsFlCkOzmF7SZXtlbjVJ68LoOOPM=";

     

       323
       325
        
             this = self.postgresql_12;

     

       324
       326
        
             thisAttr = "postgresql_12";

     

       325
       327
        
             inherit self;

     

       326
       328
        
           };

     

       327
       329
        
       

     

       328
       330
        
           postgresql_13 = self.callPackage generic {

     

       329
       329
       -
             version = "13.11";

     

       331
       331
       +
             version = "13.12";

     

       330
       332
        
             psqlSchema = "13";

     

       331
       331
       -
             hash = "sha256-SZL/ZHIDVmtnDU5U3FMXSZomhWyTV20OqVG99r7lC/s=";

     

       333
       333
       +
             hash = "sha256-DaHtzuNRS3vHum268MAEmeisFZBmjoeJxQJTpiSfIYs=";

     

       332
       334
        
             this = self.postgresql_13;

     

       333
       335
        
             thisAttr = "postgresql_13";

     

       334
       336
        
             inherit self;

     

       335
       337
        
           };

     

       336
       338
        
       

     

       337
       339
        
           postgresql_14 = self.callPackage generic {

     

       338
       338
       -
             version = "14.8";

     

       340
       340
       +
             version = "14.9";

     

       339
       341
        
             psqlSchema = "14";

     

       340
       340
       -
             hash = "sha256-OdOPADBzftA4Nd6+7+47N9M1RizkmV4kl7w41iHr5Fo=";

     

       342
       342
       +
             hash = "sha256-sf47qbGn86ljfdFlbf2tKIkBYHP9TTXxO1AUPLu2qO8=";

     

       341
       343
        
             this = self.postgresql_14;

     

       342
       344
        
             thisAttr = "postgresql_14";

     

       343
       345
        
             inherit self;

     

       344
       346
        
           };

     

       345
       347
        
       

     

       346
       348
        
           postgresql_15 = self.callPackage generic {

     

       347
       347
       -
             version = "15.3";

     

       349
       349
       +
             version = "15.4";

     

       348
       350
        
             psqlSchema = "15";

     

       349
       349
       -
             hash = "sha256-/8fUiR8A/79cP06rf7vO2EYLjA7mPFpRZxM7nmWZ2TI=";

     

       351
       351
       +
             hash = "sha256-uuxaS9xENzNmU7bLXZ7Ym+W9XAxYuU4L7O4KmZ5jyPk=";

     

       350
       352
        
             this = self.postgresql_15;

     

       351
       353
        
             thisAttr = "postgresql_15";

     

       352
       354
        
             inherit self;

+4

pkgs/shells/bash/5.nix

···

       61
       61
        
             url = "https://cgit.freebsd.org/ports/plain/shells/bash/files/patch-configure?id=3e147a1f594751a68fea00a28090d0792bee0b51";

     

       62
       62
        
             sha256 = "XHFMQ6eXTReNoywdETyrfQEv1rKF8+XFbQZP4YoVKFk=";

     

       63
       63
        
           })

     

       64
       64
       +
           # Apply parallel build fix pending upstream inclusion:

     

       65
       65
       +
           #   https://savannah.gnu.org/patch/index.php?10373

     

       66
       66
       +
           # Had to fetch manually to workaround -p0 default.

     

       67
       67
       +
           ./parallel.patch

     

       64
       68
        
         ];

     

       65
       69
        
       

     

       66
       70
        
         configureFlags = [

+12

pkgs/shells/bash/parallel.patch

···

       1
       1
       +
       From https://savannah.gnu.org/patch/index.php?10373

     

       2
       2
       +
         https://savannah.gnu.org/patch/download.php?file_id=54964

     

       3
       3
       +
       --- Makefile.in

     

       4
       4
       +
       +++ Makefile.in

     

       5
       5
       +
       @@ -1432,6 +1432,7 @@ siglist.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       6
       6
       +
        subst.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       7
       7
       +
        test.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       8
       8
       +
        trap.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       9
       9
       +
       +unwind_prot.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       10
       10
       +
        variables.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       11
       11
       +
        version.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

     

       12
       12
       +
        xmalloc.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

+21 -48

pkgs/stdenv/darwin/default.nix

···

       65
       65
        
         isBuiltByBootstrapFilesCompiler =

     

       66
       66
        
           pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc;

     

       67
       67
        
       

     

       68
       68
       -
         commonPreHook = pkgs: lib.optionalString (pkgs.darwin.system_cmds != null) ''

     

       69
       69
       -
           # Only use a response file on older systems with a small ARG_MAX (less than 1 MiB).

     

       70
       70
       -
           export NIX_CC_USE_RESPONSE_FILE=$(( "$("${lib.getBin pkgs.darwin.system_cmds}/bin/getconf" ARG_MAX)" < 1048576 ))

     

       71
       71
       -
           export NIX_LD_USE_RESPONSE_FILE=$NIX_CC_USE_RESPONSE_FILE

     

       72
       72
       -
         '' + ''

     

       68
       68
       +
         commonPreHook = ''

     

       73
       69
        
           export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1}

     

       74
       70
        
           export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1}

     

       75
       71
        
           export NIX_IGNORE_LD_THROUGH_GCC=1

     
···

       166
       162
        
                 # dependencies on the bootstrapTools in the final stdenv.

     

       167
       163
        
                 dontPatchShebangs=1

     

       168
       164
        
               '' + ''

     

       169
       169
       -
                 ${commonPreHook prevStage}

     

       165
       165
       +
                 ${commonPreHook}

     

       170
       166
        
                 ${extraPreHook}

     

       171
       167
        
               '' + lib.optionalString (prevStage.darwin ? locale) ''

     

       172
       168
        
                 export PATH_LOCALE=${prevStage.darwin.locale}/share/locale

     
···

       216
       212
        
             print-reexports = null;

     

       217
       213
        
             rewrite-tbd = null;

     

       218
       214
        
             sigtool = null;

     

       219
       219
       -
             system_cmds = null;

     

       220
       215
        
             CF = null;

     

       221
       216
        
             Libsystem = null;

     

       222
       217
        
           };

     
···

       300
       295
        
               rewrite-tbd = bootstrapTools;

     

       301
       296
        
       

     

       302
       297
        
               sigtool = bootstrapTools;

     

       303
       303
       -
       

     

       304
       304
       -
               # The bootstrap only needs `getconf` from system_cmds, and it only needs to be able to

     

       305
       305
       -
               # query `ARG_MAX`. Using a small value here should be fine for the initial stage 1 build.

     

       306
       306
       -
               system_cmds = self.stdenv.mkDerivation {

     

       307
       307
       -
                 name = "bootstrap-stage0-system_cmds";

     

       308
       308
       -
                 buildCommand = ''

     

       309
       309
       -
                   mkdir -p "$out/bin"

     

       310
       310
       -
                   cat <<block > "$out/bin/getconf"

     

       311
       311
       -
                   #!${bootstrapTools}/bin/bash

     

       312
       312
       -
                   case "\$1" in

     

       313
       313
       -
                     ARG_MAX)

     

       314
       314
       -
                       echo "262144"

     

       315
       315
       -
                       ;;

     

       316
       316
       -
                     *)

     

       317
       317
       -
                       exit 1

     

       318
       318
       -
                   esac

     

       319
       319
       -
                   block

     

       320
       320
       -
                   chmod a+x "$out/bin/getconf"

     

       321
       321
       -
                 '';

     

       322
       322
       -
                 passthru.isFromBootstrapFiles = true;

     

       323
       323
       -
               };

     

       324
       298
        
             } // lib.optionalAttrs (! useAppleSDKLibs) {

     

       325
       299
        
               CF = self.stdenv.mkDerivation {

     

       326
       300
        
                 name = "bootstrap-stage0-CF";

     
···

       453
       427
        
           assert lib.all isFromBootstrapFiles (with prevStage; [ bash coreutils cpio gnugrep pbzx ]);

     

       454
       428
        
       

     

       455
       429
        
           assert lib.all isFromBootstrapFiles (with prevStage.darwin; [

     

       456
       456
       -
             binutils-unwrapped cctools print-reexports rewrite-tbd sigtool system_cmds

     

       430
       430
       +
             binutils-unwrapped cctools print-reexports rewrite-tbd sigtool

     

       457
       431
        
           ]);

     

       458
       432
        
       

     

       459
       433
        
           assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ CF Libsystem ]);

     
···

       486
       460
        
             python3 = super.python3Minimal;

     

       487
       461
        
       

     

       488
       462
        
             darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {

     

       489
       489
       -
               inherit (prevStage.darwin) system_cmds;

     

       463
       463
       +
               signingUtils = prevStage.darwin.signingUtils.override {

     

       464
       464
       +
                 inherit (selfDarwin) sigtool;

     

       465
       465
       +
               };

     

       490
       466
        
       

     

       491
       491
       -
               signingUtils = prevStage.darwin.signingUtils.override {

     

       467
       467
       +
               postLinkSignHook = prevStage.darwin.postLinkSignHook.override {

     

       492
       468
        
                 inherit (selfDarwin) sigtool;

     

       493
       469
        
               };

     

       494
       470
        
       

     
···

       536
       512
        
           '';

     

       537
       513
        
         })

     

       538
       514
        
       

     

       539
       539
       -
         # Build sysctl, system_cmds and Python for use by LLVM’s check phase. These must be built in their

     

       515
       515
       +
         # Build sysctl and Python for use by LLVM’s check phase. These must be built in their

     

       540
       516
        
         # own stage, or an infinite recursion results on x86_64-darwin when using the source-based SDK.

     

       541
       517
        
         (prevStage:

     

       542
       518
        
           # previous stage1 stdenv:

     
···

       553
       529
        
           assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [

     

       554
       530
        
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool

     

       555
       531
        
           ]);

     

       556
       556
       -
           assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ system_cmds ]);

     

       557
       557
       -
       

     

       558
       532
        
           assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]);

     

       559
       533
        
           assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]);

     

       560
       534
        
           assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]);

     
···

       651
       625
        
           ]);

     

       652
       626
        
       

     

       653
       627
        
           assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [

     

       654
       654
       -
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool system_cmds

     

       628
       628
       +
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool

     

       655
       629
        
           ]);

     

       656
       630
        
       

     

       657
       631
        
           assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]);

     
···

       679
       653
        
             darwin = super.darwin.overrideScope (_: superDarwin: {

     

       680
       654
        
               inherit (prevStage.darwin)

     

       681
       655
        
                 CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc

     

       682
       682
       -
                 locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool

     

       683
       683
       -
                 system_cmds;

     

       656
       656
       +
                 locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool;

     

       684
       657
        
       

     

       685
       658
        
               # Avoid building unnecessary Python dependencies due to building LLVM manpages.

     

       686
       659
        
               cctools-llvm = superDarwin.cctools-llvm.override { enableManpages = false; };

     
···

       749
       722
        
           ]);

     

       750
       723
        
       

     

       751
       724
        
           assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [

     

       752
       752
       -
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool system_cmds

     

       725
       725
       +
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool

     

       753
       726
        
           ]);

     

       754
       727
        
       

     

       755
       728
        
           assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF Libsystem configd ]);

     
···

       786
       759
        
             darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {

     

       787
       760
        
               inherit (prevStage.darwin)

     

       788
       761
        
                 CF binutils-unwrapped cctools configd darwin-stubs launchd libobjc libtapi locale

     

       789
       789
       -
                 objc4 print-reexports rewrite-tbd signingUtils sigtool system_cmds;

     

       762
       762
       +
                 objc4 print-reexports rewrite-tbd signingUtils sigtool;

     

       790
       763
        
             });

     

       791
       764
        
       

     

       792
       765
        
             llvmPackages = super.llvmPackages // (

     
···

       848
       821
        
           ]);

     

       849
       822
        
       

     

       850
       823
        
           assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [

     

       851
       851
       -
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool system_cmds

     

       824
       824
       +
             binutils-unwrapped cctools locale libtapi print-reexports rewrite-tbd sigtool

     

       852
       825
        
           ]);

     

       853
       826
        
       

     

       854
       827
        
           assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ CF configd ]);

     
···

       882
       855
        
             darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {

     

       883
       856
        
               inherit (prevStage.darwin)

     

       884
       857
        
                 Libsystem configd darwin-stubs launchd locale print-reexports rewrite-tbd

     

       885
       885
       -
                 signingUtils sigtool system_cmds;

     

       858
       858
       +
                 signingUtils sigtool;

     

       886
       859
        
       

     

       887
       860
        
               # Rewrap binutils so it uses the rebuilt Libsystem.

     

       888
       861
        
               binutils = superDarwin.binutils.override {

     
···

       971
       944
        
           ]);

     

       972
       945
        
       

     

       973
       946
        
           assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [

     

       974
       974
       -
             locale print-reexports rewrite-tbd sigtool system_cmds

     

       947
       947
       +
             locale print-reexports rewrite-tbd sigtool

     

       975
       948
        
           ]);

     

       976
       949
        
           assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [

     

       977
       950
        
             binutils-unwrapped cctools libtapi

     
···

       1011
       984
        
               inherit (prevStage.darwin)

     

       1012
       985
        
                 CF Libsystem binutils binutils-unwrapped cctools cctools-llvm cctools-port configd

     

       1013
       986
        
                 darwin-stubs dyld launchd libclosure libdispatch libobjc libtapi locale objc4

     

       1014
       1014
       -
                 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool system_cmds;

     

       987
       987
       +
                 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool;

     

       1015
       988
        
             });

     

       1016
       989
        
       

     

       1017
       990
        
             llvmPackages = super.llvmPackages // (

     
···

       1051
       1024
        
           ]);

     

       1052
       1025
        
       

     

       1053
       1026
        
           assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [

     

       1054
       1054
       -
             locale print-reexports rewrite-tbd sigtool system_cmds

     

       1027
       1027
       +
             locale print-reexports rewrite-tbd sigtool

     

       1055
       1028
        
           ]);

     

       1056
       1029
        
           assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [

     

       1057
       1030
        
             binutils-unwrapped cctools libtapi

     
···

       1191
       1164
        
           ]);

     

       1192
       1165
        
       

     

       1193
       1166
        
           assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [

     

       1194
       1194
       -
             binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool system_cmds

     

       1167
       1167
       +
             binutils-unwrapped cctools libtapi locale print-reexports rewrite-tbd sigtool

     

       1195
       1168
        
           ]);

     

       1196
       1169
        
       

     

       1197
       1170
        
           assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ CF Libsystem configd ]);

     
···

       1226
       1199
        
       

     

       1227
       1200
        
             inherit config;

     

       1228
       1201
        
       

     

       1229
       1229
       -
             preHook = (commonPreHook prevStage) + ''

     

       1202
       1202
       +
             preHook = ''

     

       1203
       1203
       +
               ${commonPreHook}

     

       1230
       1204
        
               stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O

     

       1231
       1205
        
               export PATH_LOCALE=${prevStage.darwin.locale}/share/locale

     

       1232
       1206
        
             '';

     
···

       1324
       1298
        
               dyld

     

       1325
       1299
        
               libtapi

     

       1326
       1300
        
               locale

     

       1327
       1327
       -
               system_cmds

     

       1328
       1301
        
             ]

     

       1329
       1302
        
             ++ lib.optional useAppleSDKLibs [ objc4 ]

     

       1330
       1303
        
             ++ lib.optionals doSign [ postLinkSignHook sigtool signingUtils ]);

     
···

       1341
       1314
        
       

     

       1342
       1315
        
               darwin = super.darwin.overrideScope (_: _: {

     

       1343
       1316
        
                 inherit (prevStage.darwin)

     

       1344
       1344
       -
                   CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi system_cmds xnu;

     

       1317
       1317
       +
                   CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi xnu;

     

       1345
       1318
        
               } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {

     

       1346
       1319
        
                 inherit (prevStage.darwin) binutils binutils-unwrapped cctools-llvm cctools-port;

     

       1347
       1320
        
               });

+1 -4

pkgs/stdenv/generic/default.nix

···

       70
       70
        
             ../../build-support/setup-hooks/prune-libtool-files.sh

     

       71
       71
        
             ../../build-support/setup-hooks/reproducible-builds.sh

     

       72
       72
        
             ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh

     

       73
       73
       -
             (with buildPlatform; if isAarch64 && isLinux

     

       74
       74
       -
               then ../../build-support/setup-hooks/strip-tmp-aarch64.sh

     

       75
       75
       -
               else ../../build-support/setup-hooks/strip.sh

     

       76
       76
       -
             )

     

       73
       73
       +
             ../../build-support/setup-hooks/strip.sh

     

       77
       74
        
           ] ++ lib.optionals hasCC [ cc ];

     

       78
       75
        
       

     

       79
       76
        
         defaultBuildInputs = extraBuildInputs;

+3

pkgs/stdenv/linux/default.nix

···

       194
       194
        
                 inherit lib;

     

       195
       195
        
                 inherit (prevStage) coreutils gnugrep;

     

       196
       196
        
                 stdenvNoCC = prevStage.ccWrapperStdenv;

     

       197
       197
       +
                 fortify-headers = prevStage.fortify-headers;

     

       197
       198
        
               }).overrideAttrs(a: lib.optionalAttrs (prevStage.gcc-unwrapped.passthru.isXgcc or false) {

     

       198
       199
        
                 # This affects only `xgcc` (the compiler which compiles the final compiler).

     

       199
       200
        
                 postFixup = (a.postFixup or "") + ''

     
···

       568
       569
        
               inherit lib;

     

       569
       570
        
               inherit (self) stdenvNoCC coreutils gnugrep;

     

       570
       571
        
               shell = self.bash + "/bin/bash";

     

       572
       572
       +
               fortify-headers = self.fortify-headers;

     

       571
       573
        
             };

     

       572
       574
        
           };

     

       573
       575
        
           extraNativeBuildInputs = [

     
···

       645
       647
        
               ++  [ linuxHeaders # propagated from .dev

     

       646
       648
        
                   binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params gcc.cc.libgcc glibc.passthru.libgcc

     

       647
       649
        
                 ]

     

       650
       650
       +
               ++ lib.optionals (localSystem.libc == "musl") [ fortify-headers ]

     

       648
       651
        
               ++ [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ]

     

       649
       652
        
               ++ (with gcc-unwrapped.passthru; [

     

       650
       653
        
                 gmp libmpc mpfr isl

+18 -1

pkgs/test/stdenv/patch-shebangs.nix

···

       39
       39
        
             };

     

       40
       40
        
           };

     

       41
       41
        
       

     

       42
       42
       +
           updates-nix-store = stdenv.mkDerivation {

     

       43
       43
       +
             name = "updates-nix-store";

     

       44
       44
       +
             strictDeps = false;

     

       45
       45
       +
             dontUnpack = true;

     

       46
       46
       +
             installPhase = ''

     

       47
       47
       +
               mkdir -p $out/bin

     

       48
       48
       +
               echo "#!$NIX_STORE/path/to/bash" > $out/bin/test

     

       49
       49
       +
               echo "echo -n hello" >> $out/bin/test

     

       50
       50
       +
               chmod +x $out/bin/test

     

       51
       51
       +
               patchShebangs --update $out/bin/test

     

       52
       52
       +
               dontPatchShebangs=1

     

       53
       53
       +
             '';

     

       54
       54
       +
             passthru = {

     

       55
       55
       +
               assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null";

     

       56
       56
       +
             };

     

       57
       57
       +
           };

     

       58
       58
       +
       

     

       42
       59
        
           split-string = stdenv.mkDerivation {

     

       43
       60
        
             name = "split-string";

     

       44
       61
        
             strictDeps = false;

     
···

       59
       76
        
       in

     

       60
       77
        
       stdenv.mkDerivation {

     

       61
       78
        
         name = "test-patch-shebangs";

     

       62
       62
       -
         passthru = { inherit (tests) bad-shebang ignores-nix-store split-string; };

     

       79
       79
       +
         passthru = { inherit (tests) bad-shebang ignores-nix-store updates-nix-store split-string; };

     

       63
       80
        
         buildCommand = ''

     

       64
       81
        
           validate() {

     

       65
       82
        
             local name=$1

+9 -2

pkgs/tools/archivers/zip/default.nix

···

       13
       13
        
           ];

     

       14
       14
        
           sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";

     

       15
       15
        
         };

     

       16
       16
       -
         patchPhase = ''

     

       16
       16
       +
         prePatch = ''

     

       17
       17
        
           substituteInPlace unix/Makefile --replace 'CC = cc' ""

     

       18
       18
        
         '';

     

       19
       19
        
       

     
···

       26
       26
        
           "INSTALL=cp"

     

       27
       27
        
         ];

     

       28
       28
        
       

     

       29
       29
       -
         patches = lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ];

     

       29
       29
       +
         patches = [

     

       30
       30
       +
           # Trying to use `memset` without declaring it is flagged as an error with clang 16, causing

     

       31
       31
       +
           # the `configure` script to incorrectly define `ZMEM`. That causes the build to fail due to

     

       32
       32
       +
           # incompatible redeclarations of `memset`, `memcpy`, and `memcmp` in `zip.h`.

     

       33
       33
       +
           ./fix-memset-detection.patch

     

       34
       34
       +
           # Implicit declaration of `closedir` and `opendir` cause dirent detection to fail with clang 16.

     

       35
       35
       +
           ./fix-implicit-declarations.patch

     

       36
       36
       +
         ] ++ lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ];

     

       30
       37
        
       

     

       31
       38
        
         buildInputs = lib.optional enableNLS libnatspec

     

       32
       39
        
           ++ lib.optional stdenv.isCygwin libiconv;

+21

pkgs/tools/archivers/zip/fix-implicit-declarations.patch

···

       1
       1
       +
       --- a/unix/configure	2009-04-16 15:25:12.000000000 -0400

     

       2
       2
       +
       +++ b/unix/configure	2023-05-30 15:18:33.670321348 -0400

     

       3
       3
       +
       @@ -408,7 +408,7 @@

     

       4
       4
       +
        echo Check for errno declaration

     

       5
       5
       +
        cat > conftest.c << _EOF_

     

       6
       6
       +
        #include <errno.h>

     

       7
       7
       +
       -main()

     

       8
       8
       +
       +int main()

     

       9
       9
       +
        {

     

       10
       10
       +
          errno = 0;

     

       11
       11
       +
          return 0;

     

       12
       12
       +
       @@ -419,6 +419,8 @@

     

       13
       13
       +
        

     

       14
       14
       +
        echo Check for directory libraries

     

       15
       15
       +
        cat > conftest.c << _EOF_

     

       16
       16
       +
       +#include <sys/types.h>

     

       17
       17
       +
       +#include <dirent.h>

     

       18
       18
       +
        int main() { return closedir(opendir(".")); }

     

       19
       19
       +
        _EOF_

     

       20
       20
       +
        

     

       21
       21
       +

+15

pkgs/tools/archivers/zip/fix-memset-detection.patch

···

       1
       1
       +
       diff -ur a/unix/configure b/unix/configure

     

       2
       2
       +
       --- a/unix/configure	2008-06-19 21:32:20.000000000 -0600

     

       3
       3
       +
       +++ b/unix/configure	2023-07-11 10:02:57.809867694 -0600

     

       4
       4
       +
       @@ -519,7 +519,10 @@

     

       5
       5
       +
        

     

       6
       6
       +
        

     

       7
       7
       +
        echo Check for memset

     

       8
       8
       +
       -echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c

     

       9
       9
       +
       +cat > conftest.c << _EOF_

     

       10
       10
       +
       +#include <string.h>

     

       11
       11
       +
       +int main(){ char k; memset(&k,0,0); return 0; }

     

       12
       12
       +
       +_EOF_

     

       13
       13
       +
        $CC -o conftest conftest.c >/dev/null 2>/dev/null

     

       14
       14
       +
        [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"

     

       15
       15
       +

+2 -2

pkgs/tools/compression/xz/default.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "xz";

     

       13
       13
       -
         version = "5.4.3";

     

       13
       13
       +
         version = "5.4.4";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "https://tukaani.org/xz/xz-${version}.tar.bz2";

     

       17
       17
       -
           sha256 = "sha256-kkOgRZjXpwwfVnoBQ6JVWBrFxksUD9Vf1cvB4AsOb5A=";

     

       17
       17
       +
           sha256 = "sha256-C2/N4aw46QQzolVvUAwGWVC5vNLWAgBu/DNHgr3+YpY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         strictDeps = true;

+2 -2

pkgs/tools/graphics/graphviz/default.nix

···

       28
       28
        
       in

     

       29
       29
        
       stdenv.mkDerivation rec {

     

       30
       30
        
         pname = "graphviz";

     

       31
       31
       -
         version = "8.0.5";

     

       31
       31
       +
         version = "8.1.0";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitLab {

     

       34
       34
        
           owner = "graphviz";

     

       35
       35
        
           repo = "graphviz";

     

       36
       36
        
           rev = version;

     

       37
       37
       -
           hash = "sha256-s3AUOLZhehxs2GcDCsq87RVvsDli1NvvQtwI0AyUs4k=";

     

       37
       37
       +
           hash = "sha256-xTdrtwSpizqf5tNRX0Q0w10mEk4S0X7cmxHj3Us14kY=";

     

       38
       38
        
         };

     

       39
       39
        
       

     

       40
       40
        
         nativeBuildInputs = [

+2 -2

pkgs/tools/misc/nanoemoji/default.nix

···

       36
       36
        
           absl-py

     

       37
       37
        
           fonttools

     

       38
       38
        
           lxml

     

       39
       39
       -
           ninja-python

     

       39
       39
       +
           ninja

     

       40
       40
        
           picosvg

     

       41
       41
        
           pillow

     

       42
       42
        
           regex

     
···

       50
       50
        
         nativeCheckInputs = with python3.pkgs; [

     

       51
       51
        
           pytestCheckHook

     

       52
       52
        
       

     

       53
       53
       -
           ninja-python

     

       53
       53
       +
           ninja

     

       54
       54
        
           picosvg

     

       55
       55
        
         ];

     

       56
       56

+17 -2

pkgs/top-level/all-packages.nix

···

       21168
       21168
        
       

     

       21169
       21169
        
         folks = callPackage ../development/libraries/folks { };

     

       21170
       21170
        
       

     

       21171
       21171
       +
         fortify-headers = callPackage ../development/libraries/fortify-headers { };

     

       21172
       21172
       +
       

     

       21171
       21173
        
         makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:

     

       21172
       21174
        
           callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {

     

       21173
       21175
        
             inherit fontconfig fontDirectories;

     
···

       24365
       24367
        
       

     

       24366
       24368
        
         prospector = callPackage ../development/tools/prospector { };

     

       24367
       24369
        
       

     

       24368
       24368
       -
         protobuf = protobuf3_21;

     

       24370
       24370
       +
         protobuf = protobuf3_23;

     

       24369
       24371
        
       

     

       24372
       24372
       +
         protobuf3_23 = callPackage ../development/libraries/protobuf/3.23.nix { };

     

       24370
       24373
        
         protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix {

     

       24371
       24374
        
           abseil-cpp = abseil-cpp_202103;

     

       24372
       24375
        
         };

     
···

       25722
       25725
        
         };

     

       25723
       25726
        
         buildGo120Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {

     

       25724
       25727
        
           go = buildPackages.go_1_20;

     

       25728
       25728
       +
         };

     

       25729
       25729
       +
       

     

       25730
       25730
       +
         # requires a newer Apple SDK

     

       25731
       25731
       +
         go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix {

     

       25732
       25732
       +
           inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;

     

       25733
       25733
       +
         };

     

       25734
       25734
       +
         buildGo121Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {

     

       25735
       25735
       +
           go = buildPackages.go_1_21;

     

       25736
       25736
       +
         };

     

       25737
       25737
       +
         buildGo121Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {

     

       25738
       25738
       +
           go = buildPackages.go_1_21;

     

       25725
       25739
        
         };

     

       25726
       25740
        
       

     

       25727
       25741
        
         go2nix = callPackage ../development/tools/go2nix { };

     
···

       31082
       31096
        
       

     

       31083
       31097
        
         ecs-agent = callPackage ../applications/virtualization/ecs-agent { };

     

       31084
       31098
        
       

     

       31085
       31085
       -
         ed = callPackage ../applications/editors/ed { };

     

       31099
       31099
       +
         inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { }))

     

       31100
       31100
       +
           ed edUnstable;

     

       31086
       31101
        
       

     

       31087
       31102
        
         edbrowse = callPackage ../applications/editors/edbrowse { };

     

       31088
       31103

+2 -12

pkgs/top-level/darwin-packages.nix

···

       133
       133
        
       

     

       134
       134
        
         sigtool = callPackage ../os-specific/darwin/sigtool { };

     

       135
       135
        
       

     

       136
       136
       -
         postLinkSignHook = pkgs.writeTextFile {

     

       137
       137
       -
           name = "post-link-sign-hook";

     

       138
       138
       -
           executable = true;

     

       139
       139
       -
       

     

       140
       140
       -
           text = ''

     

       141
       141
       -
             if [ "$linkerOutput" != "/dev/null" ]; then

     

       142
       142
       -
               CODESIGN_ALLOCATE=${targetPrefix}codesign_allocate \

     

       143
       143
       -
                 ${self.sigtool}/bin/codesign -f -s - "$linkerOutput"

     

       144
       144
       -
             fi

     

       145
       145
       -
           '';

     

       146
       146
       -
         };

     

       136
       136
       +
         signingUtils = callPackage ../os-specific/darwin/signing-utils { };

     

       147
       137
        
       

     

       148
       148
       -
         signingUtils = callPackage ../os-specific/darwin/signing-utils { };

     

       138
       138
       +
         postLinkSignHook = callPackage ../os-specific/darwin/signing-utils/post-link-sign-hook.nix { };

     

       149
       139
        
       

     

       150
       140
        
         autoSignDarwinBinariesHook = pkgs.makeSetupHook {

     

       151
       141
        
           name = "auto-sign-darwin-binaries-hook";

+2

pkgs/top-level/python-aliases.nix

···

       96
       96
        
         django_classytags = django-classy-tags; # added 2023-07-25

     

       97
       97
        
         django_colorful = django-colorful; # added 2023-07-25

     

       98
       98
        
         django_compat = django-compat; # added 2023-07-25

     

       99
       99
       +
         django-compat = throw "django-compat has been removed. It provided forward/backport compat for django 1.x, which is long end of life."; # added 2023-07-26

     

       99
       100
        
         django_contrib_comments = django-contrib-comments; # added 2023-07-25

     

       100
       101
        
         django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21

     

       101
       102
        
         django_environ = django-environ; # added 2021-12-25

     
···

       213
       214
        
         mutmut = throw "mutmut has been promoted to a top-level attribute"; # added 2022-10-02

     

       214
       215
        
         net2grid = gridnet; # add 2022-04-22

     

       215
       216
        
         nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08

     

       217
       217
       +
         ninja-python = ninja; # add 2022-08-03

     

       216
       218
        
         nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16

     

       217
       219
        
         nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21

     

       218
       220
        
         notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02

+11 -8

pkgs/top-level/python-packages.nix

···

       2735
       2735
        
       

     

       2736
       2736
        
         distutils_extra = callPackage ../development/python-modules/distutils_extra { };

     

       2737
       2737
        
       

     

       2738
       2738
       -
         django = self.django_3;

     

       2739
       2739
       -
       

     

       2740
       2740
       -
         # Current LTS

     

       2738
       2738
       +
         # LTS in extended support phase

     

       2741
       2739
        
         django_3 = callPackage ../development/python-modules/django/3.nix { };

     

       2742
       2740
        
       

     

       2743
       2743
       -
         # Current latest

     

       2741
       2741
       +
         # LTS with mainsteam support

     

       2742
       2742
       +
         django = self.django_4;

     

       2744
       2743
        
         django_4 = callPackage ../development/python-modules/django/4.nix { };

     

       2745
       2744
        
       

     

       2746
       2745
        
         django-admin-datta = callPackage ../development/python-modules/django-admin-datta { };

     
···

       2784
       2783
        
         django-cleanup = callPackage ../development/python-modules/django-cleanup { };

     

       2785
       2784
        
       

     

       2786
       2785
        
         django-colorful = callPackage ../development/python-modules/django-colorful { };

     

       2787
       2787
       -
       

     

       2788
       2788
       -
         django-compat = callPackage ../development/python-modules/django-compat { };

     

       2789
       2786
        
       

     

       2790
       2787
        
         django-compressor = callPackage ../development/python-modules/django-compressor { };

     

       2791
       2788
        
       

     
···

       3686
       3683
        
       

     

       3687
       3684
        
         ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { };

     

       3688
       3685
        
       

     

       3686
       3686
       +
         ffmpy = callPackage ../development/python-modules/ffmpy { };

     

       3687
       3687
       +
       

     

       3689
       3688
        
         fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { };

     

       3690
       3689
        
       

     

       3691
       3690
        
         fido2 = callPackage ../development/python-modules/fido2 { };

     
···

       4489
       4488
        
         gradient-utils = callPackage ../development/python-modules/gradient-utils { };

     

       4490
       4489
        
       

     

       4491
       4490
        
         gradient_statsd = callPackage ../development/python-modules/gradient_statsd { };

     

       4491
       4491
       +
       

     

       4492
       4492
       +
         gradio = callPackage ../development/python-modules/gradio { };

     

       4492
       4493
        
       

     

       4493
       4494
        
         grammalecte = callPackage ../development/python-modules/grammalecte { };

     

       4494
       4495
        
       

     
···

       6467
       6468
        
       

     

       6468
       6469
        
         mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };

     

       6469
       6470
        
       

     

       6470
       6470
       -
         meson-python = callPackage ../development/python-modules/meson-python { };

     

       6471
       6471
       +
         meson-python = callPackage ../development/python-modules/meson-python {

     

       6472
       6472
       +
           inherit (pkgs) ninja;

     

       6473
       6473
       +
         };

     

       6471
       6474
        
       

     

       6472
       6475
        
         messagebird = callPackage ../development/python-modules/messagebird { };

     

       6473
       6476
        
       

     
···

       7062
       7065
        
       

     

       7063
       7066
        
         nine = callPackage ../development/python-modules/nine { };

     

       7064
       7067
        
       

     

       7065
       7065
       -
         ninja-python = callPackage ../development/python-modules/ninja { };

     

       7068
       7068
       +
         ninja = callPackage ../development/python-modules/ninja { inherit (pkgs) ninja; };

     

       7066
       7069
        
       

     

       7067
       7070
        
         nipy = callPackage ../development/python-modules/nipy { };

     

       7068
       7071