Unverified Commit ac95eb6c authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'master' into staging-next

parents a345ed27 29cda285

doc/stdenv/cross-compilation.chapter.md

+1 −1
Original line number Diff line number Diff line
@@ -250,5 +250,5 @@ Thirdly, it is because everything target-mentioning only exists to accommodate c 
:::



::: {.note}

If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.nativeDrv` or `.crossDrv`. This ugliness will disappear soon.

If one explores Nixpkgs, they will see derivations with names like `gccCross`. Such `*Cross` derivations is a holdover from before we properly distinguished between the host and target platforms—the derivation with “Cross” in the name covered the `build = host != target` case, while the other covered the `host = target`, with build platform the same or not based on whether one was using its `.__spliced.buildHost` or `.__spliced.hostTarget`.

:::

lib/customisation.nix

+9 −6
Original line number Diff line number Diff line
@@ -38,12 +38,15 @@ rec { 
      //

      (drv.passthru or {})

      //

      (if (drv ? crossDrv && drv ? nativeDrv)

       then {

      # TODO(@Artturin): remove before release 23.05 and only have __spliced.

      (lib.optionalAttrs (drv ? crossDrv && drv ? nativeDrv) {

        crossDrv = overrideDerivation drv.crossDrv f;

        nativeDrv = overrideDerivation drv.nativeDrv f;

       }

       else { }));

      })

      //

      lib.optionalAttrs (drv ? __spliced) {

        __spliced = {} // (lib.mapAttrs (_: sDrv: overrideDerivation sDrv f) drv.__spliced);

      });





  /* `makeOverridable` takes a function from attribute set to attribute set and

pkgs/applications/editors/texstudio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 


mkDerivation rec {

  pname = "texstudio";

  version = "4.3.1";

  version = "4.4.0";



  src = fetchFromGitHub {

    owner = "${pname}-org";

    repo = pname;

    rev = version;

    hash = "sha256-CwfnRkG8GsRQuE0+l394gMdj5ao3SUKaDnYP2dfUEew=";

    hash = "sha256-BaTfebLilUeDNtCJZmgAx+hN+L+4MtnuL6t3wQRX/Ns=";

  };



  nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];

pkgs/applications/networking/browsers/firefox-bin/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
, pango

, pipewire

, pciutils

, libheimdal

, heimdal

, libpulseaudio

, systemd

, channel
@@ -134,7 +134,7 @@ stdenv.mkDerivation { 
      pango

      pipewire

      pciutils

      libheimdal

      heimdal

      libpulseaudio

      systemd

      ffmpeg

pkgs/applications/networking/instant-messengers/threema-desktop/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 


stdenv.mkDerivation rec {

  pname = "threema-desktop";

  version = "1.2.13";

  version = "1.2.21";



  src = fetchurl {

    # As Threema only offers a Latest Release url, the plan is to upload each

    # new release url to web.archive.org until their Github releases page gets populated.

    url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";

    sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE=";

    url = "https://web.archive.org/web/20220915175906if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb";

    sha256 = "0icxn5whsvwmdmfbkfk4xnl3dn4iif5s5yw5hsimmyx066fq0qhb";

  };



  nativeBuildInputs = [