commit fe64053a459a55da80dc5ec4d0286e1e16479846 · pyrox.dev/nixpkgs

+1 -1

doc/languages-frameworks/python.section.md

···

       220
       220
        
       * `dependencies ? []`: Aside from propagating dependencies,

     

       221
       221
        
         `buildPythonPackage` also injects code into and wraps executables with the

     

       222
       222
        
         paths included in this list. Items listed in `install_requires` go here.

     

       223
       223
       -
       * `optional-dependencies ? { }`: Optional feature flagged dependencies.  Items listed in `extras_requires` go here.

     

       223
       223
       +
       * `optional-dependencies ? { }`: Optional feature flagged dependencies.  Items listed in `extras_require` go here.

     

       224
       224
        
       

     

       225
       225
        
       

     

       226
       226
        
       ##### Overriding Python packages {#overriding-python-packages}

+1

lib/systems/default.nix

···

       102
       102
        
               else if final.isMusl                  then "musl"

     

       103
       103
        
               else if final.isUClibc                then "uclibc"

     

       104
       104
        
               else if final.isAndroid               then "bionic"

     

       105
       105
       +
               else if final.isLLVMLibc              then "llvm"

     

       105
       106
        
               else if final.isLinux  /* default */  then "glibc"

     

       106
       107
        
               else if final.isFreeBSD               then "fblibc"

     

       107
       108
        
               else if final.isOpenBSD               then "oblibc"

+1

lib/systems/inspect.nix

···

       113
       113
        
           isGnu          = with abis; map (a: { abi = a; }) [ gnuabi64 gnuabin32 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];

     

       114
       114
        
           isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];

     

       115
       115
        
           isUClibc       = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];

     

       116
       116
       +
           isLLVMLibc     = [ { abi = abis.llvm; } ];

     

       116
       117
        
       

     

       117
       118
        
           isEfi = [

     

       118
       119
        
             { cpu = { family = "arm"; version = "6"; }; }

+3

lib/systems/parse.nix

···

       416
       416
        
           uclibceabihf = { float = "hard"; };

     

       417
       417
        
           uclibc       = {};

     

       418
       418
        
       

     

       419
       419
       +
           # LLVM libc

     

       420
       420
       +
           llvm         = {};

     

       421
       421
       +
       

     

       419
       422
        
           unknown = {};

     

       420
       423
        
         };

     

       421
       424

+4

pkgs/applications/radio/cubicsdr/default.nix

···

       62
       62
        
       

     

       63
       63
        
         cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";

     

       64
       64
        
       

     

       65
       65
       +
         postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       66
       66
       +
           install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR

     

       67
       67
       +
         '';

     

       68
       68
       +
       

     

       65
       69
        
         meta = with lib; {

     

       66
       70
        
           homepage = "https://cubicsdr.com";

     

       67
       71
        
           description = "Software Defined Radio application";

+19 -7

pkgs/by-name/al/alsa-lib/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         alsa-topology-conf,

     

       6
       7
        
         alsa-ucm-conf,

     

       7
       8
        
         testers,

     
···

       16
       17
        
           hash = "sha256-jE/zdVPL6JYY4Yfkx3n3GpuyqLJ7kfh+1AmHzJIz2PY=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       19
       -
         patches = [

     

       20
       20
       -
           # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.

     

       21
       21
       -
           # The nixos modules for pulseaudio, jack, and pipewire are leveraging this

     

       22
       22
       -
           # "libs" field to declare locations for both native and 32bit plugins, in

     

       23
       23
       -
           # order to support apps with 32bit sound running on x86_64 architecture.

     

       24
       24
       -
           ./alsa-plugin-conf-multilib.patch

     

       25
       25
       -
         ];

     

       20
       20
       +
         patches =

     

       21
       21
       +
           [

     

       22
       22
       +
             # Add a "libs" field to the syntax recognized in the /etc/asound.conf file.

     

       23
       23
       +
             # The nixos modules for pulseaudio, jack, and pipewire are leveraging this

     

       24
       24
       +
             # "libs" field to declare locations for both native and 32bit plugins, in

     

       25
       25
       +
             # order to support apps with 32bit sound running on x86_64 architecture.

     

       26
       26
       +
             ./alsa-plugin-conf-multilib.patch

     

       27
       27
       +
           ]

     

       28
       28
       +
           ++ lib.optional (stdenv.hostPlatform.useLLVM or false)

     

       29
       29
       +
             # Fixes version script under LLVM, should be fixed in the next update.

     

       30
       30
       +
             # Check if "pkgsLLVM.alsa-lib" builds on next version bump and remove this

     

       31
       31
       +
             # if it succeeds.

     

       32
       32
       +
             (

     

       33
       33
       +
               fetchurl {

     

       34
       34
       +
                 url = "https://github.com/alsa-project/alsa-lib/commit/76edab4e595bd5f3f4c636cccc8d7976d3c519d6.patch";

     

       35
       35
       +
                 hash = "sha256-WCOXfe0/PPZRMXdNa29Jn28S2r0PQ7iTsabsxZVSwnk=";

     

       36
       36
       +
               }

     

       37
       37
       +
             );

     

       26
       38
        
       

     

       27
       39
        
         enableParallelBuilding = true;

     

       28
       40

+2 -2

pkgs/by-name/ca/calibre/package.nix

···

       35
       35
        
       

     

       36
       36
        
       stdenv.mkDerivation (finalAttrs: {

     

       37
       37
        
         pname = "calibre";

     

       38
       38
       -
         version = "7.22.0";

     

       38
       38
       +
         version = "7.24.0";

     

       39
       39
        
       

     

       40
       40
        
         src = fetchurl {

     

       41
       41
        
           url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";

     

       42
       42
       -
           hash = "sha256-RmCte6tok0F/ts5cacAFBksNYfnLylY4JCmTyb+6IUk=";

     

       42
       42
       +
           hash = "sha256-ftqi6ANY/w4CdcMUAzRn9GOpNbSz36mnNcGHv8ffKbQ=";

     

       43
       43
        
         };

     

       44
       44
        
       

     

       45
       45
        
         patches = [

+110

pkgs/by-name/co/cosmic-player/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         fetchFromGitHub,

     

       4
       4
       +
         rustPlatform,

     

       5
       5
       +
         alsa-lib,

     

       6
       6
       +
         ffmpeg,

     

       7
       7
       +
         glib,

     

       8
       8
       +
         gst_all_1,

     

       9
       9
       +
         just,

     

       10
       10
       +
         pkg-config,

     

       11
       11
       +
         libxkbcommon,

     

       12
       12
       +
         stdenv,

     

       13
       13
       +
         cosmic-icons,

     

       14
       14
       +
         libglvnd,

     

       15
       15
       +
         libgbm,

     

       16
       16
       +
         wayland,

     

       17
       17
       +
         xorg,

     

       18
       18
       +
         vulkan-loader,

     

       19
       19
       +
         makeBinaryWrapper,

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       rustPlatform.buildRustPackage rec {

     

       23
       23
       +
         pname = "cosmic-player";

     

       24
       24
       +
         version = "1.0.0-alpha.5.1";

     

       25
       25
       +
       

     

       26
       26
       +
         src = fetchFromGitHub {

     

       27
       27
       +
           owner = "pop-os";

     

       28
       28
       +
           repo = pname;

     

       29
       29
       +
           rev = "epoch-${version}";

     

       30
       30
       +
           hash = "sha256-IgMFKtuMAfRtbxunwrwRzFi/0PcSMWhx33uJcxiAHhI=";

     

       31
       31
       +
         };

     

       32
       32
       +
       

     

       33
       33
       +
         useFetchCargoVendor = true;

     

       34
       34
       +
         cargoHash = "sha256-VSUv4yV54fzWPhxZV/EjBrkx7tTLo6vfSHNiluWnn9A=";

     

       35
       35
       +
       

     

       36
       36
       +
         postPatch = ''

     

       37
       37
       +
           substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
         nativeBuildInputs = [

     

       41
       41
       +
           just

     

       42
       42
       +
           pkg-config

     

       43
       43
       +
           makeBinaryWrapper

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         # Largely based on lilyinstarlight's work linked below

     

       47
       47
       +
         # https://github.com/lilyinstarlight/nixos-cosmic/blob/main/pkgs/cosmic-player/package.nix

     

       48
       48
       +
       

     

       49
       49
       +
         buildInputs = [

     

       50
       50
       +
           alsa-lib

     

       51
       51
       +
           ffmpeg

     

       52
       52
       +
           glib

     

       53
       53
       +
           gst_all_1.gstreamer

     

       54
       54
       +
           gst_all_1.gst-plugins-base

     

       55
       55
       +
           gst_all_1.gst-plugins-good

     

       56
       56
       +
           gst_all_1.gst-plugins-bad

     

       57
       57
       +
           libxkbcommon

     

       58
       58
       +
           libgbm

     

       59
       59
       +
           wayland

     

       60
       60
       +
           vulkan-loader

     

       61
       61
       +
           xorg.libX11

     

       62
       62
       +
           libglvnd

     

       63
       63
       +
         ];

     

       64
       64
       +
       

     

       65
       65
       +
         dontUseJustBuild = true;

     

       66
       66
       +
       

     

       67
       67
       +
         justFlags = [

     

       68
       68
       +
           "--set"

     

       69
       69
       +
           "prefix"

     

       70
       70
       +
           (placeholder "out")

     

       71
       71
       +
           "--set"

     

       72
       72
       +
           "bin-src"

     

       73
       73
       +
           "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-player"

     

       74
       74
       +
         ];

     

       75
       75
       +
       

     

       76
       76
       +
         # Force linking to libEGL, which is always dlopen()ed, and to

     

       77
       77
       +
         # libwayland-client, which is always dlopen()ed except by the

     

       78
       78
       +
         # obscure winit backend.

     

       79
       79
       +
         RUSTFLAGS = map (a: "-C link-arg=${a}") [

     

       80
       80
       +
           "-Wl,--push-state,--no-as-needed"

     

       81
       81
       +
           "-lEGL"

     

       82
       82
       +
           "-lwayland-client"

     

       83
       83
       +
           "-Wl,--pop-state"

     

       84
       84
       +
         ];

     

       85
       85
       +
       

     

       86
       86
       +
         # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2

     

       87
       87
       +
         postInstall = ''

     

       88
       88
       +
           wrapProgram "$out/bin/cosmic-player" \

     

       89
       89
       +
             --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \

     

       90
       90
       +
             --prefix LD_LIBRARY_PATH : ${

     

       91
       91
       +
               lib.makeLibraryPath [

     

       92
       92
       +
                 xorg.libX11

     

       93
       93
       +
                 xorg.libXcursor

     

       94
       94
       +
                 xorg.libXi

     

       95
       95
       +
                 vulkan-loader

     

       96
       96
       +
                 libxkbcommon

     

       97
       97
       +
                 wayland

     

       98
       98
       +
               ]

     

       99
       99
       +
             }

     

       100
       100
       +
         '';

     

       101
       101
       +
       

     

       102
       102
       +
         meta = {

     

       103
       103
       +
           homepage = "https://github.com/pop-os/cosmic-player";

     

       104
       104
       +
           description = "Media player for the COSMIC Desktop Environment";

     

       105
       105
       +
           license = lib.licenses.gpl3Only;

     

       106
       106
       +
           maintainers = with lib.maintainers; [ ahoneybun ];

     

       107
       107
       +
           platforms = lib.platforms.linux;

     

       108
       108
       +
           mainProgram = "cosmic-player";

     

       109
       109
       +
         };

     

       110
       110
       +
       }

+3 -3

pkgs/by-name/co/cosmic-workspaces-epoch/package.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage rec {

     

       15
       15
        
         pname = "cosmic-workspaces-epoch";

     

       16
       16
       -
         version = "1.0.0-alpha.2";

     

       16
       16
       +
         version = "1.0.0-alpha.5.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "pop-os";

     

       20
       20
        
           repo = "cosmic-workspaces-epoch";

     

       21
       21
        
           rev = "epoch-${version}";

     

       22
       22
       -
           hash = "sha256-z3xQ6Vgqkm8hYLo2550NbFRkTMRQ0F9zn85iobnykH5=";

     

       22
       22
       +
           hash = "sha256-lAK7DZWwNMr30u6Uopew9O/6FIG6e2SgcdA+cD/K5Ok=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         useFetchCargoVendor = true;

     

       26
       26
       -
         cargoHash = "sha256-QRBgFTXPWQ0RCSfCA2WpBs+vKTFD7Xfz60cIDtbYb5Y=";

     

       26
       26
       +
         cargoHash = "sha256-w1lQdzy2mJ5NfqngvOLqFCxyhWgvIySDDXCCtCCtTjg=";

     

       27
       27
        
       

     

       28
       28
        
         separateDebugInfo = true;

     

       29
       29

+5 -5

pkgs/by-name/db/dbeaver-bin/package.nix

···

       17
       17
        
       

     

       18
       18
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       19
       19
        
         pname = "dbeaver-bin";

     

       20
       20
       -
         version = "24.3.2";

     

       20
       20
       +
         version = "24.3.3";

     

       21
       21
        
       

     

       22
       22
        
         src =

     

       23
       23
        
           let

     
···

       30
       30
        
               aarch64-darwin = "macos-aarch64.dmg";

     

       31
       31
        
             };

     

       32
       32
        
             hash = selectSystem {

     

       33
       33
       -
               x86_64-linux = "sha256-kbpdAA/ZmH1f+MEfozyjr8HTKLhWEhswAGc7iSpy9rE=";

     

       34
       34
       -
               aarch64-linux = "sha256-SiNriPbyiMeHZSHab3JwyedURogPjI9McXwJqjpZXiA=";

     

       35
       35
       -
               x86_64-darwin = "sha256-cBJvElGfuCbyFRXzqcuQRa4GA6nXmEDxtse388FuH30=";

     

       36
       36
       -
               aarch64-darwin = "sha256-kzJeKY7V8CBcdsoDZDI9eBrr1hEWh3vyHI3wgos/s/M=";

     

       33
       33
       +
               x86_64-linux = "sha256-vj9C12bGJbWjmcjp2jVyvLmLHYdLjbEU0SVvevhkd4A=";

     

       34
       34
       +
               aarch64-linux = "sha256-vQArRJZvf38JEfDBNE4GfemddM4M1ar7RojXNTb6YaU=";

     

       35
       35
       +
               x86_64-darwin = "sha256-r+CLBy4zetjPXDzm6abQqY8IvE0UfROg5Ga0nIrb9oc=";

     

       36
       36
       +
               aarch64-darwin = "sha256-W8NAs5Z8Ogl1uv2zngi4A4viBL51izsv7ksS7gygh9I=";

     

       37
       37
        
             };

     

       38
       38
        
           in

     

       39
       39
        
           fetchurl {

+2 -2

pkgs/by-name/di/dillo/package.nix

···

       31
       31
        
       in

     

       32
       32
        
       stdenv.mkDerivation (finalAttrs: {

     

       33
       33
        
         pname = "dillo";

     

       34
       34
       -
         version = "3.1.1";

     

       34
       34
       +
         version = "3.2.0";

     

       35
       35
        
       

     

       36
       36
        
         src = fetchFromGitHub {

     

       37
       37
        
           owner = "dillo-browser";

     

       38
       38
        
           repo = "dillo";

     

       39
       39
        
           rev = "v${finalAttrs.version}";

     

       40
       40
       -
           hash = "sha256-bGIOYONMtIN4IhSobOeSLiRDR13mo4W/DBX4kQ2S+hg=";

     

       40
       40
       +
           hash = "sha256-9nJq20iW8/UI3GgXWje+46WDSu3/omd1PN/uTlYCOac=";

     

       41
       41
        
         };

     

       42
       42
        
       

     

       43
       43
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/do/doublecmd/package.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         pname = "doublecmd";

     

       17
       17
       -
         version = "1.1.21";

     

       17
       17
       +
         version = "1.1.22";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "doublecmd";

     

       21
       21
        
           repo = "doublecmd";

     

       22
       22
        
           rev = "v${finalAttrs.version}";

     

       23
       23
       -
           hash = "sha256-NsjsjCSPbo7zwejmOjFRuQpcMyGZEY67hyStjtMrIGk=";

     

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

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/im/immich-public-proxy/package.nix

···

       8
       8
        
       }:

     

       9
       9
        
       buildNpmPackage rec {

     

       10
       10
        
         pname = "immich-public-proxy";

     

       11
       11
       -
         version = "1.5.6";

     

       11
       11
       +
         version = "1.6.2";

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "alangrainger";

     

       14
       14
        
           repo = "immich-public-proxy";

     

       15
       15
        
           tag = "v${version}";

     

       16
       16
       -
           hash = "sha256-nAXSlzMJNx7QjdHr/Ax8RAcWVcsMgBLbBO0CqpWCsvA=";

     

       16
       16
       +
           hash = "sha256-R2w11AdOgcV1R1eIzDgt+yexWwystDNJiJ+14MH6WtU=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         sourceRoot = "${src.name}/app";

     

       20
       20
        
       

     

       21
       21
       -
         npmDepsHash = "sha256-rtDd8Gadi3OrnM34Sr2FG6htYeh2G0cYDcv/hKk1TIw=";

     

       21
       21
       +
         npmDepsHash = "sha256-VXCJ0VaAKOlz342saRAnb1MLZGgIZwPpy/2oS/Gvsj8=";

     

       22
       22
        
       

     

       23
       23
        
         # patch in absolute nix store paths so the process doesn't need to cwd in $out

     

       24
       24
        
         postPatch = ''

+12 -6

pkgs/by-name/im/immich/package.nix

···

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         fetchpatch2,

     

       7
       7
        
         python3,

     

       8
       8
       -
         nodejs_20,

     

       8
       8
       +
         nodejs,

     

       9
       9
        
         node-gyp,

     

       10
       10
        
         runCommand,

     

       11
       11
        
         nixosTests,

     
···

       27
       27
        
         vips,

     

       28
       28
        
       }:

     

       29
       29
        
       let

     

       30
       30
       -
         nodejs = nodejs_20;

     

       31
       30
        
         buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };

     

       32
       31
        
         sources = lib.importJSON ./sources.json;

     

       33
       32
        
         inherit (sources) version;

     
···

       132
       131
        
       

     

       133
       132
        
         node-addon-api = stdenvNoCC.mkDerivation rec {

     

       134
       133
        
           pname = "node-addon-api";

     

       135
       135
       -
           version = "8.0.0";

     

       134
       134
       +
           version = "8.3.0";

     

       136
       135
        
           src = fetchFromGitHub {

     

       137
       136
        
             owner = "nodejs";

     

       138
       137
        
             repo = "node-addon-api";

     

       139
       138
        
             tag = "v${version}";

     

       140
       140
       -
             hash = "sha256-k3v8lK7uaEJvcaj1sucTjFZ6+i5A6w/0Uj9rYlPhjCE=";

     

       139
       139
       +
             hash = "sha256-7KkJkMNX352XnWTOC6mJB+IcFrda20UENcNwoXWDm+s=";

     

       141
       140
        
           };

     

       142
       141
        
           installPhase = ''

     

       143
       142
        
             mkdir $out

     
···

       181
       180
        
         # Required because vips tries to write to the cache dir

     

       182
       181
        
         makeCacheWritable = true;

     

       183
       182
        
       

     

       183
       183
       +
         # we manually build sharp from source later on

     

       184
       184
       +
         # FIXME figure out why otherwise it fails with

     

       185
       185
       +
         #     error: 'NewOrCopy' is not a member of 'Napi::Buffer<char>'

     

       186
       186
       +
         env.SHARP_IGNORE_GLOBAL_LIBVIPS = 1;

     

       187
       187
       +
       

     

       184
       188
        
         preBuild = ''

     

       189
       189
       +
           unset SHARP_IGNORE_GLOBAL_LIBVIPS

     

       190
       190
       +
           export SHARP_FORCE_GLOBAL_LIBVIPS=1

     

       191
       191
       +
       

     

       185
       192
        
           pushd node_modules/sharp

     

       186
       193
        
       

     

       187
       194
        
           mkdir node_modules

     
···

       205
       212
        
           npm prune --omit=dev

     

       206
       213
        
       

     

       207
       214
        
           # remove build artifacts that bloat the closure

     

       208
       208
       -
           rm -r node_modules/bcrypt/{build-tmp-napi-v3,node_modules/node-addon-api,src,test}

     

       209
       209
       -
           rm -r node_modules/msgpackr-extract/build

     

       215
       215
       +
           rm -r node_modules/**/{*.target.mk,binding.Makefile,config.gypi,Makefile,Release/.deps}

     

       210
       216
        
       

     

       211
       217
        
           mkdir -p $out/build

     

       212
       218
        
           mv package.json package-lock.json node_modules dist resources $out/

+12 -12

pkgs/by-name/im/immich/sources.json

···

       1
       1
        
       {

     

       2
       2
       -
         "version": "1.123.0",

     

       3
       3
       -
         "hash": "sha256-qzNujf8zRtml57EmyPu0qY0dbswcLhPSHOuGRkSXtVY=",

     

       2
       2
       +
         "version": "1.124.2",

     

       3
       3
       +
         "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=",

     

       4
       4
        
         "components": {

     

       5
       5
        
           "cli": {

     

       6
       6
       -
             "npmDepsHash": "sha256-L94vKYmNWO3IcJh+ZtJ2EBz6h3G9jeyqyw44tto8bQ0=",

     

       7
       7
       -
             "version": "2.2.37"

     

       6
       6
       +
             "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=",

     

       7
       7
       +
             "version": "2.2.40"

     

       8
       8
        
           },

     

       9
       9
        
           "server": {

     

       10
       10
       -
             "npmDepsHash": "sha256-JUFeaaT4uqyff48nDMrlvC8maU+BjwNU3xcOOR1f8F4=",

     

       11
       11
       -
             "version": "1.123.0"

     

       10
       10
       +
             "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=",

     

       11
       11
       +
             "version": "1.124.2"

     

       12
       12
        
           },

     

       13
       13
        
           "web": {

     

       14
       14
       -
             "npmDepsHash": "sha256-eq+VJVBZGVoMgAjdp/F+bu24cHSneAoTWpeft59Gig8=",

     

       15
       15
       -
             "version": "1.123.0"

     

       14
       14
       +
             "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=",

     

       15
       15
       +
             "version": "1.124.2"

     

       16
       16
        
           },

     

       17
       17
        
           "open-api/typescript-sdk": {

     

       18
       18
       -
             "npmDepsHash": "sha256-n5B0fKRhDTrobT7SGUAMqsWSkHW4pEYRVzlMqAyfJwk=",

     

       19
       19
       -
             "version": "1.123.0"

     

       18
       18
       +
             "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=",

     

       19
       19
       +
             "version": "1.124.2"

     

       20
       20
        
           },

     

       21
       21
        
           "geonames": {

     

       22
       22
       -
             "timestamp": "20241217171200",

     

       23
       23
       -
             "hash": "sha256-A21TooXLWSmCW4NaYq+2juaNlAmzTT76ZwtF5NcJcLU="

     

       22
       22
       +
             "timestamp": "20250108222614",

     

       23
       23
       +
             "hash": "sha256-gCi0iFQplv4XizDi9DYEVekFFe46DM4X2YiPSe7ugR4="

     

       24
       24
        
           }

     

       25
       25
        
         }

     

       26
       26
        
       }

+16 -5

pkgs/by-name/ke/keep-sorted/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         buildGo123Module,

     

       3
       3
       +
         buildGoModule,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         nix-update-script,

     

       6
       6
       +
         versionCheckHook,

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       8
       -
       buildGo123Module rec {

     

       9
       9
       +
       buildGoModule rec {

     

       9
       10
        
         pname = "keep-sorted";

     

       10
       10
       -
         version = "0.5.1";

     

       11
       11
       +
         version = "0.6.0";

     

       11
       12
        
       

     

       12
       13
        
         src = fetchFromGitHub {

     

       13
       14
        
           owner = "google";

     

       14
       15
        
           repo = "keep-sorted";

     

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

     

       16
       16
       -
           hash = "sha256-xvSEREEOiwft3fPN+xtdMCh+z3PknjJ962Nb+pw715U=";

     

       16
       16
       +
           tag = "v${version}";

     

       17
       17
       +
           hash = "sha256-ROvj7w8YMq6+ntx0SWi+HfN4sO6d7RjKWwlb/9gfz8w=";

     

       17
       18
        
         };

     

       18
       19
        
       

     

       19
       20
        
         vendorHash = "sha256-HTE9vfjRmi5GpMue7lUfd0jmssPgSOljbfPbya4uGsc=";

     

       20
       21
        
       

     

       22
       22
       +
         # Inject version string instead of reading version from buildinfo.

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           substituteInPlace main.go \

     

       25
       25
       +
             --replace-fail 'readVersion())' '"v${version}")'

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       21
       28
        
         env.CGO_ENABLED = "0";

     

       22
       29
        
       

     

       23
       30
        
         ldflags = [ "-s" ];

     
···

       26
       33
        
           # Test tries to find files using git in init func.

     

       27
       34
        
           rm goldens/*_test.go

     

       28
       35
        
         '';

     

       36
       36
       +
       

     

       37
       37
       +
         nativeInstallCheckInputs = [ versionCheckHook ];

     

       38
       38
       +
       

     

       39
       39
       +
         doInstallCheck = true;

     

       29
       40
        
       

     

       30
       41
        
         passthru.updateScript = nix-update-script { };

     

       31
       42

+4

pkgs/by-name/mi/mint-artwork/package.nix

···

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         installPhase = ''

     

       26
       26
       +
           runHook preInstall

     

       27
       27
       +
       

     

       26
       28
        
           mkdir $out

     

       27
       29
        
       

     

       28
       30
        
           # note: we fuck up a bunch of stuff but idc

     
···

       37
       39
        
       

     

       38
       40
        
           mv etc $out/etc

     

       39
       41
        
           mv usr/share $out/share

     

       42
       42
       +
       

     

       43
       43
       +
           runHook postInstall

     

       40
       44
        
         '';

     

       41
       45
        
       

     

       42
       46
        
         meta = with lib; {

+2 -2

pkgs/by-name/re/responsively-app/package.nix

···

       6
       6
        
       

     

       7
       7
        
       appimageTools.wrapType2 rec {

     

       8
       8
        
         pname = "responsively-app";

     

       9
       9
       -
         version = "1.15.0";

     

       9
       9
       +
         version = "1.16.0";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "https://github.com/responsively-org/responsively-app-releases/releases/download/v${version}/ResponsivelyApp-${version}.AppImage";

     

       13
       13
       -
           hash = "sha256-BkljY8Il45A2JbsLgQbjsxCy0lnFZvtpc5HzvI1nwWk=";

     

       13
       13
       +
           hash = "sha256-r0wznN+7zZXKNFNFUV4hm2e4gd84M6hVcun4OfNEeSw=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         appimageContents = appimageTools.extract {

+3 -3

pkgs/by-name/ux/uxn/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "uxn";

     

       11
       11
       -
         version = "1.0-unstable-2025-01-04";

     

       11
       11
       +
         version = "1.0-unstable-2025-01-19";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromSourcehut {

     

       14
       14
        
           owner = "~rabbits";

     

       15
       15
        
           repo = "uxn";

     

       16
       16
       -
           rev = "b2d09ce518742de16add4d5f5b96f320e274e5a2";

     

       17
       17
       -
           hash = "sha256-BNI2226vWo/XcIRrTWdoHmkckQ0U9yWawqlPamTu0PI=";

     

       16
       16
       +
           rev = "e2ab8811f85d8420e580dec08c53fe588ba96f05";

     

       17
       17
       +
           hash = "sha256-/1I//qyz8VbLPSuJbVYNeVKQjwMHKK/ojO57F6qrIAY=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         outputs = [

+127 -114

pkgs/development/compilers/llvm/common/default.nix

···

       1075
       1075
        
                 relative = "compiler-rt";

     

       1076
       1076
        
               });

     

       1077
       1077
        
           in

     

       1078
       1078
       -
           {

     

       1079
       1079
       -
             compiler-rt-libc = callPackage ./compiler-rt (

     

       1080
       1080
       -
               let

     

       1081
       1081
       -
                 # temp rename to avoid infinite recursion

     

       1078
       1078
       +
           (

     

       1079
       1079
       +
             {

     

       1080
       1080
       +
               compiler-rt-libc = callPackage ./compiler-rt (

     

       1081
       1081
       +
                 let

     

       1082
       1082
       +
                   # temp rename to avoid infinite recursion

     

       1083
       1083
       +
                   stdenv =

     

       1084
       1084
       +
                     # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.

     

       1085
       1085
       +
                     if args.stdenv.hostPlatform.isDarwin then

     

       1086
       1086
       +
                       overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx

     

       1087
       1087
       +
                     else if args.stdenv.hostPlatform.useLLVM or false then

     

       1088
       1088
       +
                       overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx

     

       1089
       1089
       +
                     else

     

       1090
       1090
       +
                       args.stdenv;

     

       1091
       1091
       +
                 in

     

       1092
       1092
       +
                 {

     

       1093
       1093
       +
                   patches = compiler-rtPatches;

     

       1094
       1094
       +
                   inherit stdenv;

     

       1095
       1095
       +
                 }

     

       1096
       1096
       +
                 // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {

     

       1097
       1097
       +
                   libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {

     

       1098
       1098
       +
                     configureFlags = old.configureFlags ++ [ "--disable-symvers" ];

     

       1099
       1099
       +
                   });

     

       1100
       1100
       +
                 }

     

       1101
       1101
       +
               );

     

       1102
       1102
       +
       

     

       1103
       1103
       +
               compiler-rt-no-libc = callPackage ./compiler-rt {

     

       1104
       1104
       +
                 patches = compiler-rtPatches;

     

       1105
       1105
       +
                 doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;

     

       1082
       1106
        
                 stdenv =

     

       1083
       1107
        
                   # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.

     

       1084
       1084
       -
                   if args.stdenv.hostPlatform.isDarwin then

     

       1085
       1085
       -
                     overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx

     

       1086
       1086
       -
                   else if args.stdenv.hostPlatform.useLLVM or false then

     

       1087
       1087
       -
                     overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx

     

       1108
       1108
       +
                   if stdenv.hostPlatform.isDarwin then

     

       1109
       1109
       +
                     overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt

     

       1088
       1110
        
                   else

     

       1089
       1089
       -
                     args.stdenv;

     

       1090
       1090
       -
               in

     

       1091
       1091
       -
               {

     

       1092
       1092
       -
                 patches = compiler-rtPatches;

     

       1093
       1093
       -
                 inherit stdenv;

     

       1094
       1094
       -
               }

     

       1095
       1095
       -
               // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {

     

       1096
       1096
       -
                 libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {

     

       1097
       1097
       -
                   configureFlags = old.configureFlags ++ [ "--disable-symvers" ];

     

       1098
       1098
       -
                 });

     

       1099
       1099
       -
               }

     

       1100
       1100
       -
             );

     

       1111
       1111
       +
                     overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;

     

       1112
       1112
       +
               };

     

       1101
       1113
        
       

     

       1102
       1102
       -
             compiler-rt-no-libc = callPackage ./compiler-rt {

     

       1103
       1103
       -
               patches = compiler-rtPatches;

     

       1104
       1104
       -
               doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;

     

       1105
       1105
       -
               stdenv =

     

       1106
       1106
       -
                 # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.

     

       1107
       1107
       -
                 if stdenv.hostPlatform.isDarwin then

     

       1108
       1108
       -
                   overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt

     

       1114
       1114
       +
               compiler-rt =

     

       1115
       1115
       +
                 if

     

       1116
       1116
       +
                   stdenv.hostPlatform.libc == null

     

       1117
       1117
       +
                   # Building the with-libc compiler-rt and WASM doesn't yet work,

     

       1118
       1118
       +
                   # because wasilibc doesn't provide some expected things. See

     

       1119
       1119
       +
                   # compiler-rt's file for further details.

     

       1120
       1120
       +
                   || stdenv.hostPlatform.isWasm

     

       1121
       1121
       +
                   # Failing `#include <term.h>` in

     

       1122
       1122
       +
                   # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`

     

       1123
       1123
       +
                   # sanitizers, not sure where to get it.

     

       1124
       1124
       +
                   || stdenv.hostPlatform.isFreeBSD

     

       1125
       1125
       +
                 then

     

       1126
       1126
       +
                   libraries.compiler-rt-no-libc

     

       1109
       1127
        
                 else

     

       1110
       1110
       -
                   overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;

     

       1111
       1111
       -
             };

     

       1112
       1112
       -
       

     

       1113
       1113
       -
             compiler-rt =

     

       1114
       1114
       -
               if

     

       1115
       1115
       -
                 stdenv.hostPlatform.libc == null

     

       1116
       1116
       -
                 # Building the with-libc compiler-rt and WASM doesn't yet work,

     

       1117
       1117
       -
                 # because wasilibc doesn't provide some expected things. See

     

       1118
       1118
       -
                 # compiler-rt's file for further details.

     

       1119
       1119
       -
                 || stdenv.hostPlatform.isWasm

     

       1120
       1120
       -
                 # Failing `#include <term.h>` in

     

       1121
       1121
       -
                 # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`

     

       1122
       1122
       -
                 # sanitizers, not sure where to get it.

     

       1123
       1123
       -
                 || stdenv.hostPlatform.isFreeBSD

     

       1124
       1124
       -
               then

     

       1125
       1125
       -
                 libraries.compiler-rt-no-libc

     

       1126
       1126
       -
               else

     

       1127
       1127
       -
                 libraries.compiler-rt-libc;

     

       1128
       1128
       +
                   libraries.compiler-rt-libc;

     

       1128
       1129
        
       

     

       1129
       1129
       -
             stdenv = overrideCC stdenv buildLlvmTools.clang;

     

       1130
       1130
       +
               stdenv = overrideCC stdenv buildLlvmTools.clang;

     

       1130
       1131
        
       

     

       1131
       1131
       -
             libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;

     

       1132
       1132
       +
               libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;

     

       1132
       1133
        
       

     

       1133
       1133
       -
             libcxx = callPackage ./libcxx (

     

       1134
       1134
       -
               {

     

       1135
       1135
       -
                 patches = lib.optionals (lib.versionOlder metadata.release_version "16") (

     

       1136
       1136
       -
                   lib.optional (lib.versions.major metadata.release_version == "15")

     

       1137
       1137
       -
                     # See:

     

       1138
       1138
       -
                     #   - https://reviews.llvm.org/D133566

     

       1139
       1139
       -
                     #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432

     

       1140
       1140
       -
                     # !!! Drop in LLVM 16+

     

       1141
       1141
       -
                     (

     

       1142
       1142
       -
                       fetchpatch {

     

       1143
       1143
       -
                         url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";

     

       1144
       1144
       -
                         hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";

     

       1145
       1145
       -
                       }

     

       1146
       1146
       -
                     )

     

       1147
       1147
       -
                   ++ [

     

       1148
       1148
       -
                     (substitute {

     

       1149
       1149
       -
                       src = ./libcxxabi/wasm.patch;

     

       1134
       1134
       +
               libcxx = callPackage ./libcxx (

     

       1135
       1135
       +
                 {

     

       1136
       1136
       +
                   patches = lib.optionals (lib.versionOlder metadata.release_version "16") (

     

       1137
       1137
       +
                     lib.optional (lib.versions.major metadata.release_version == "15")

     

       1138
       1138
       +
                       # See:

     

       1139
       1139
       +
                       #   - https://reviews.llvm.org/D133566

     

       1140
       1140
       +
                       #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432

     

       1141
       1141
       +
                       # !!! Drop in LLVM 16+

     

       1142
       1142
       +
                       (

     

       1143
       1143
       +
                         fetchpatch {

     

       1144
       1144
       +
                           url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";

     

       1145
       1145
       +
                           hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";

     

       1146
       1146
       +
                         }

     

       1147
       1147
       +
                       )

     

       1148
       1148
       +
                     ++ [

     

       1149
       1149
       +
                       (substitute {

     

       1150
       1150
       +
                         src = ./libcxxabi/wasm.patch;

     

       1151
       1151
       +
                         substitutions = [

     

       1152
       1152
       +
                           "--replace-fail"

     

       1153
       1153
       +
                           "/cmake/"

     

       1154
       1154
       +
                           "/llvm/cmake/"

     

       1155
       1155
       +
                         ];

     

       1156
       1156
       +
                       })

     

       1157
       1157
       +
                     ]

     

       1158
       1158
       +
                     ++ lib.optional stdenv.hostPlatform.isMusl (substitute {

     

       1159
       1159
       +
                       src = ./libcxx/libcxx-0001-musl-hacks.patch;

     

       1150
       1160
        
                       substitutions = [

     

       1151
       1161
        
                         "--replace-fail"

     

       1152
       1152
       -
                         "/cmake/"

     

       1153
       1153
       -
                         "/llvm/cmake/"

     

       1162
       1162
       +
                         "/include/"

     

       1163
       1163
       +
                         "/libcxx/include/"

     

       1154
       1164
        
                       ];

     

       1155
       1165
        
                     })

     

       1156
       1156
       -
                   ]

     

       1157
       1157
       -
                   ++ lib.optional stdenv.hostPlatform.isMusl (substitute {

     

       1158
       1158
       -
                     src = ./libcxx/libcxx-0001-musl-hacks.patch;

     

       1159
       1159
       -
                     substitutions = [

     

       1160
       1160
       -
                       "--replace-fail"

     

       1161
       1161
       -
                       "/include/"

     

       1162
       1162
       -
                       "/libcxx/include/"

     

       1163
       1163
       -
                     ];

     

       1164
       1164
       -
                   })

     

       1166
       1166
       +
                   );

     

       1167
       1167
       +
                   stdenv =

     

       1168
       1168
       +
                     if stdenv.hostPlatform.isDarwin then

     

       1169
       1169
       +
                       overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt

     

       1170
       1170
       +
                     else

     

       1171
       1171
       +
                       overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       1172
       1172
       +
                 }

     

       1173
       1173
       +
                 // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {

     

       1174
       1174
       +
                   # TODO: remove this, causes LLVM 13 packages rebuild.

     

       1175
       1175
       +
                   inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor.

     

       1176
       1176
       +
                 }

     

       1177
       1177
       +
               );

     

       1178
       1178
       +
       

     

       1179
       1179
       +
               libunwind = callPackage ./libunwind {

     

       1180
       1180
       +
                 patches = lib.optional (lib.versionOlder metadata.release_version "17") (

     

       1181
       1181
       +
                   metadata.getVersionFile "libunwind/gnu-install-dirs.patch"

     

       1165
       1182
        
                 );

     

       1166
       1166
       -
                 stdenv =

     

       1167
       1167
       -
                   if stdenv.hostPlatform.isDarwin then

     

       1168
       1168
       -
                     overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt

     

       1169
       1169
       -
                   else

     

       1170
       1170
       -
                     overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       1171
       1171
       -
               }

     

       1172
       1172
       -
               // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {

     

       1173
       1173
       -
                 # TODO: remove this, causes LLVM 13 packages rebuild.

     

       1174
       1174
       -
                 inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor.

     

       1175
       1175
       -
               }

     

       1176
       1176
       -
             );

     

       1183
       1183
       +
                 stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       1184
       1184
       +
               };

     

       1177
       1185
        
       

     

       1178
       1178
       -
             libunwind = callPackage ./libunwind {

     

       1179
       1179
       -
               patches = lib.optional (lib.versionOlder metadata.release_version "17") (

     

       1180
       1180
       -
                 metadata.getVersionFile "libunwind/gnu-install-dirs.patch"

     

       1181
       1181
       -
               );

     

       1182
       1182
       -
               stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       1183
       1183
       -
             };

     

       1186
       1186
       +
               openmp = callPackage ./openmp {

     

       1187
       1187
       +
                 patches =

     

       1188
       1188
       +
                   lib.optional (

     

       1189
       1189
       +
                     lib.versionAtLeast metadata.release_version "15" && lib.versionOlder metadata.release_version "19"

     

       1190
       1190
       +
                   ) (metadata.getVersionFile "openmp/fix-find-tool.patch")

     

       1191
       1191
       +
                   ++ lib.optional (

     

       1192
       1192
       +
                     lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"

     

       1193
       1193
       +
                   ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch")

     

       1194
       1194
       +
                   ++ lib.optional (lib.versionAtLeast metadata.release_version "14") (

     

       1195
       1195
       +
                     metadata.getVersionFile "openmp/run-lit-directly.patch"

     

       1196
       1196
       +
                   )

     

       1197
       1197
       +
                   ++

     

       1198
       1198
       +
                     lib.optional (lib.versionOlder metadata.release_version "14")

     

       1199
       1199
       +
                       # Fix cross.

     

       1200
       1200
       +
                       (

     

       1201
       1201
       +
                         fetchpatch {

     

       1202
       1202
       +
                           url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

     

       1203
       1203
       +
                           hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

     

       1204
       1204
       +
                         }

     

       1205
       1205
       +
                       );

     

       1206
       1206
       +
               };

     

       1207
       1207
       +
             }

     

       1208
       1208
       +
             // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {

     

       1209
       1209
       +
               libc-overlay = callPackage ./libc {

     

       1210
       1210
       +
                 isFullBuild = false;

     

       1211
       1211
       +
               };

     

       1184
       1212
        
       

     

       1185
       1185
       -
             openmp = callPackage ./openmp {

     

       1186
       1186
       -
               patches =

     

       1187
       1187
       -
                 lib.optional (

     

       1188
       1188
       -
                   lib.versionAtLeast metadata.release_version "15" && lib.versionOlder metadata.release_version "19"

     

       1189
       1189
       -
                 ) (metadata.getVersionFile "openmp/fix-find-tool.patch")

     

       1190
       1190
       -
                 ++ lib.optional (

     

       1191
       1191
       -
                   lib.versionAtLeast metadata.release_version "14" && lib.versionOlder metadata.release_version "18"

     

       1192
       1192
       -
                 ) (metadata.getVersionFile "openmp/gnu-install-dirs.patch")

     

       1193
       1193
       -
                 ++ lib.optional (lib.versionAtLeast metadata.release_version "14") (

     

       1194
       1194
       -
                   metadata.getVersionFile "openmp/run-lit-directly.patch"

     

       1195
       1195
       -
                 )

     

       1196
       1196
       -
                 ++

     

       1197
       1197
       -
                   lib.optional (lib.versionOlder metadata.release_version "14")

     

       1198
       1198
       -
                     # Fix cross.

     

       1199
       1199
       -
                     (

     

       1200
       1200
       -
                       fetchpatch {

     

       1201
       1201
       -
                         url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

     

       1202
       1202
       -
                         hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

     

       1203
       1203
       -
                       }

     

       1204
       1204
       -
                     );

     

       1205
       1205
       -
             };

     

       1206
       1206
       -
           }

     

       1213
       1213
       +
               libc-full = callPackage ./libc {

     

       1214
       1214
       +
                 isFullBuild = true;

     

       1215
       1215
       +
               };

     

       1216
       1216
       +
       

     

       1217
       1217
       +
               libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;

     

       1218
       1218
       +
             }

     

       1219
       1219
       +
           )

     

       1207
       1220
        
         );

     

       1208
       1221
        
       

     

       1209
       1222
        
         noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];

+95

pkgs/development/compilers/llvm/common/libc/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         llvm_meta,

     

       5
       5
       +
         src ? null,

     

       6
       6
       +
         monorepoSrc ? null,

     

       7
       7
       +
         version,

     

       8
       8
       +
         release_version,

     

       9
       9
       +
         runCommand,

     

       10
       10
       +
         python3,

     

       11
       11
       +
         python3Packages,

     

       12
       12
       +
         patches ? [ ],

     

       13
       13
       +
         cmake,

     

       14
       14
       +
         ninja,

     

       15
       15
       +
         isFullBuild ? true,

     

       16
       16
       +
         linuxHeaders,

     

       17
       17
       +
       }:

     

       18
       18
       +
       let

     

       19
       19
       +
         pname = "libc";

     

       20
       20
       +
       

     

       21
       21
       +
         src' = runCommand "${pname}-src-${version}" { } (''

     

       22
       22
       +
           mkdir -p "$out"

     

       23
       23
       +
           cp -r ${monorepoSrc}/cmake "$out"

     

       24
       24
       +
           cp -r ${monorepoSrc}/runtimes "$out"

     

       25
       25
       +
           cp -r ${monorepoSrc}/llvm "$out"

     

       26
       26
       +
           cp -r ${monorepoSrc}/${pname} "$out"

     

       27
       27
       +
         '');

     

       28
       28
       +
       

     

       29
       29
       +
         stdenv' =

     

       30
       30
       +
           if stdenv.cc.isClang then

     

       31
       31
       +
             stdenv.override {

     

       32
       32
       +
               cc = stdenv.cc.override {

     

       33
       33
       +
                 nixSupport = stdenv.cc.nixSupport // {

     

       34
       34
       +
                   cc-cflags = lib.remove "-lunwind" stdenv.cc.nixSupport.cc-cflags;

     

       35
       35
       +
                 };

     

       36
       36
       +
               };

     

       37
       37
       +
             }

     

       38
       38
       +
           else

     

       39
       39
       +
             stdenv;

     

       40
       40
       +
       in

     

       41
       41
       +
       stdenv'.mkDerivation (finalAttrs: {

     

       42
       42
       +
         inherit pname version patches;

     

       43
       43
       +
       

     

       44
       44
       +
         src = src';

     

       45
       45
       +
       

     

       46
       46
       +
         sourceRoot = "${finalAttrs.src.name}/runtimes";

     

       47
       47
       +
       

     

       48
       48
       +
         nativeBuildInputs =

     

       49
       49
       +
           [

     

       50
       50
       +
             cmake

     

       51
       51
       +
             python3

     

       52
       52
       +
           ]

     

       53
       53
       +
           ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)

     

       54
       54
       +
           ++ (lib.optional isFullBuild python3Packages.pyyaml);

     

       55
       55
       +
       

     

       56
       56
       +
         buildInputs = lib.optional isFullBuild linuxHeaders;

     

       57
       57
       +
       

     

       58
       58
       +
         outputs = [ "out" ] ++ (lib.optional isFullBuild "dev");

     

       59
       59
       +
       

     

       60
       60
       +
         postUnpack = lib.optionalString isFullBuild ''

     

       61
       61
       +
           patchShebangs $sourceRoot/../$pname/hdrgen/yaml_to_classes.py

     

       62
       62
       +
           chmod +x $sourceRoot/../$pname/hdrgen/yaml_to_classes.py

     

       63
       63
       +
         '';

     

       64
       64
       +
       

     

       65
       65
       +
         prePatch = ''

     

       66
       66
       +
           cd ../${finalAttrs.pname}

     

       67
       67
       +
           chmod -R u+w ../

     

       68
       68
       +
         '';

     

       69
       69
       +
       

     

       70
       70
       +
         postPatch = ''

     

       71
       71
       +
           cd ../runtimes

     

       72
       72
       +
         '';

     

       73
       73
       +
       

     

       74
       74
       +
         postInstall = lib.optionalString (!isFullBuild) ''

     

       75
       75
       +
           substituteAll ${./libc-shim.so} $out/lib/libc.so

     

       76
       76
       +
         '';

     

       77
       77
       +
       

     

       78
       78
       +
         libc = if (!isFullBuild) then stdenv.cc.libc else null;

     

       79
       79
       +
       

     

       80
       80
       +
         cmakeFlags = [

     

       81
       81
       +
           (lib.cmakeBool "LLVM_LIBC_FULL_BUILD" isFullBuild)

     

       82
       82
       +
           (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libc")

     

       83
       83
       +
         ];

     

       84
       84
       +
       

     

       85
       85
       +
         # For the update script:

     

       86
       86
       +
         passthru = {

     

       87
       87
       +
           monorepoSrc = monorepoSrc;

     

       88
       88
       +
           inherit isFullBuild;

     

       89
       89
       +
         };

     

       90
       90
       +
       

     

       91
       91
       +
         meta = llvm_meta // {

     

       92
       92
       +
           homepage = "https://libc.llvm.org/";

     

       93
       93
       +
           description = "Standard C library for LLVM";

     

       94
       94
       +
         };

     

       95
       95
       +
       })

+1

pkgs/development/compilers/llvm/common/libc/libc-shim.so

···

       1
       1
       +
       GROUP (@libc@ @out@/lib/libllvmlibc.a)

+3 -3

pkgs/development/compilers/llvm/default.nix

···

       31
       31
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       32
       32
        
           "19.1.6".officialRelease.sha256 = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI=";

     

       33
       33
        
           "20.0.0-git".gitRelease = {

     

       34
       34
       -
             rev = "eb5cda480d2ad81230b2aa3e134e2b603ff90a1c";

     

       35
       35
       -
             rev-version = "20.0.0-unstable-2024-11-26";

     

       36
       36
       -
             sha256 = "sha256-8VbQINEZZqAIF4egMaNPd3/W3E3QmOXMl7WToftrebg=";

     

       34
       34
       +
             rev = "1ef5b987a464611a60e873650726b5e02fda0feb";

     

       35
       35
       +
             rev-version = "20.0.0-unstable-2024-12-17";

     

       36
       36
       +
             sha256 = "sha256-QCY9z9h3z5gPvwq6bNzAB5xFFStwOCfKh4VnWInhxU4=";

     

       37
       37
        
           };

     

       38
       38
        
         } // llvmVersions;

     

       39
       39

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "python-linkplay";

     

       18
       18
       -
         version = "0.1.2";

     

       18
       18
       +
         version = "0.1.3";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "Velleman";

     

       23
       23
        
           repo = "python-linkplay";

     

       24
       24
        
           tag = "v${version}";

     

       25
       25
       -
           hash = "sha256-HXsE2DzCyTF9UPZvM3YrwclTzUor+XRuz5UFlixLmRA=";

     

       25
       25
       +
           hash = "sha256-iS4JWnHt3m0i+K/OqEOxBU4fNHRsy7h5HmdwkMRpI80=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         build-system = [ setuptools ];

+6 -6

pkgs/servers/nextcloud/notify_push.nix

···

       7
       7
        
       

     

       8
       8
        
       rustPlatform.buildRustPackage rec {

     

       9
       9
        
         pname = "notify_push";

     

       10
       10
       -
         version = "0.7.0";

     

       10
       10
       +
         version = "1.0.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "nextcloud";

     

       14
       14
       -
           repo = pname;

     

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

     

       16
       16
       -
           hash = "sha256-QHVWiH6qkwQay0wffoyDUyVxgxzNp10ieYIsdqoEdCM=";

     

       14
       14
       +
           repo = "notify_push";

     

       15
       15
       +
           tag = "v${version}";

     

       16
       16
       +
           hash = "sha256-Y71o+ARi/YB2BRDfEyORbrA9HPvsUlWdh5UjM8hzmcA=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
       -
         cargoHash = "sha256-HwE/ql8rJcGIINy+hNnpaTFEJqbmuUDrIvVI8kCpfQ8=";

     

       19
       19
       +
         cargoHash = "sha256-Mk+0LKP55Um5YiCx2O49rUZPwaXtKFnWtRC+WPGBadE=";

     

       20
       20
        
       

     

       21
       21
        
         passthru = rec {

     

       22
       22
        
           test_client = rustPlatform.buildRustPackage {

     
···

       25
       25
        
       

     

       26
       26
        
             buildAndTestSubdir = "test_client";

     

       27
       27
        
       

     

       28
       28
       -
             cargoHash = "sha256-KybnPzCM9mLF55s5eZ3qr5GRcaaYFpEdNklWEo/72Ts=";

     

       28
       28
       +
             cargoHash = "sha256-SBEuFOTgqNjPtKx0PFDA5Gkiksn3cZEmYcs2shAo2Po=";

     

       29
       29
        
       

     

       30
       30
        
             meta = meta // {

     

       31
       31
        
               mainProgram = "test_client";

+3

pkgs/top-level/all-packages.nix

···

       9011
       9011
        
           else if name == "nblibc" then targetPackages.netbsd.libc or netbsd.libc

     

       9012
       9012
        
           else if name == "wasilibc" then targetPackages.wasilibc or wasilibc

     

       9013
       9013
        
           else if name == "relibc" then targetPackages.relibc or relibc

     

       9014
       9014
       +
           else if name == "llvm" then

     

       9015
       9015
       +
             # Use llvmPackages_git until LLVM 20 is the default.

     

       9016
       9016
       +
             targetPackages.llvmPackages_git.libc or llvmPackages_git.libc

     

       9014
       9017
        
           else throw "Unknown libc ${name}";

     

       9015
       9018
        
       

     

       9016
       9019
        
         libcCross =

+2 -2

pkgs/top-level/perl-packages.nix

···

       91
       91
        
       

     

       92
       92
        
         ack = buildPerlPackage rec {

     

       93
       93
        
           pname = "ack";

     

       94
       94
       -
           version = "3.7.0";

     

       94
       94
       +
           version = "3.8.0";

     

       95
       95
        
       

     

       96
       96
        
           src = fetchurl {

     

       97
       97
        
             url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v${version}.tar.gz";

     

       98
       98
       -
             hash = "sha256-6nyqFPdX3ggzEO0suimGYd3Mpd7gbsjxgEPqYlp53yA=";

     

       98
       98
       +
             hash = "sha256-ZAsaGzbKFaTR0XkvKkTmmurlg5HPDSH6iilmWoiV9xg=";

     

       99
       99
        
           };

     

       100
       100
        
       

     

       101
       101
        
           outputs = [ "out" "man" ];

+1

pkgs/top-level/release-attrpaths-superset.nix

···

       50
       50
        
       

     

       51
       51
        
           # cross packagesets

     

       52
       52
        
           pkgsLLVM = true;

     

       53
       53
       +
           pkgsLLVMLibc = true;

     

       53
       54
        
           pkgsMusl = true;

     

       54
       55
        
           pkgsStatic = true;

     

       55
       56
        
           pkgsCross = true;

+1

pkgs/top-level/release.nix

···

       345
       345
        
             agdaPackages = packagePlatforms pkgs.agdaPackages;

     

       346
       346
        
       

     

       347
       347
        
             pkgsLLVM.stdenv = [ "x86_64-linux" "aarch64-linux" ];

     

       348
       348
       +
             pkgsLLVMLibc.stdenv = [ "x86_64-linux" "aarch64-linux" ];

     

       348
       349
        
             pkgsArocc.stdenv = [ "x86_64-linux" "aarch64-linux" ];

     

       349
       350
        
             pkgsZig.stdenv = [ "x86_64-linux" "aarch64-linux" ];

     

       350
       351
        
             pkgsMusl.stdenv = [ "x86_64-linux" "aarch64-linux" ];

+17

pkgs/top-level/stage.nix

···

       98
       98
        
                 or lib.systems.parse.abis.musl;

     

       99
       99
        
             });

     

       100
       100
        
       

     

       101
       101
       +
         makeLLVMParsedPlatform = parsed:

     

       102
       102
       +
           (parsed // {

     

       103
       103
       +
             abi = lib.systems.parse.abis.llvm;

     

       104
       104
       +
           });

     

       101
       105
        
       

     

       102
       106
        
         stdenvAdapters = self: super:

     

       103
       107
        
           let

     
···

       204
       208
        
             crossSystem = stdenv.hostPlatform // {

     

       205
       209
        
               useLLVM = true;

     

       206
       210
        
               linker = "lld";

     

       211
       211
       +
             };

     

       212
       212
       +
           };

     

       213
       213
       +
       

     

       214
       214
       +
           pkgsLLVMLibc = nixpkgsFun {

     

       215
       215
       +
             overlays = [ (self': super': {

     

       216
       216
       +
               pkgsLLVMLibc = super';

     

       217
       217
       +
             })] ++ overlays;

     

       218
       218
       +
             # Bootstrap a cross stdenv using LLVM libc.

     

       219
       219
       +
             # This is currently not possible when compiling natively,

     

       220
       220
       +
             # so we don't need to check hostPlatform != buildPlatform.

     

       221
       221
       +
             crossSystem = stdenv.hostPlatform // {

     

       222
       222
       +
               config = lib.systems.parse.tripleFromSystem (makeLLVMParsedPlatform stdenv.hostPlatform.parsed);

     

       223
       223
       +
               libc = "llvm";

     

       207
       224
        
             };

     

       208
       225
        
           };

     

       209
       226