Unverified Commit 8dbe8106 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 7de798ff 23eae005

nixos/modules/services/display-managers/sddm.nix

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ in 
    };



    environment = {

      etc."sddm.conf".source = cfgFile;

      etc."sddm.conf.d/00-nixos.conf".source = cfgFile;

      pathsToLink = [

        "/share/sddm"

      ];

nixos/modules/virtualisation/azure-image.nix

+15 −1
Original line number Diff line number Diff line
@@ -67,6 +67,16 @@ in 
        For v2, secure boot needs to be turned off during creation.

      '';

    };



    additionalSpace = mkOption {

      type = types.str;

      default = "512M";

      example = "2048M";

      description = ''

        additional disk space to be added to the image if diskSize "auto"

        is used.

      '';

    };

  };



  config = {
@@ -81,8 +91,12 @@ in 
      # generating raw format and convert with subformat args afterwards

      format = "raw";

      postVM = ''

        ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/${config.image.fileName}

        ${lib.getExe' pkgs.vmTools.qemu "qemu-img"} convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/${config.image.fileName}

        rm $diskImage

      ''

      + lib.optionalString (cfg.diskSize == "auto") ''

        truncate -s +${cfg.additionalSpace} "$out/${config.image.fileName}"

        ${lib.getExe' pkgs.cloud-utils "growpart"} "$out/${config.image.fileName}" 1

      '';

      configFile = ./azure-config-user.nix;

pkgs/applications/graphics/inkscape/with-extensions.nix

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ let 
in



symlinkJoin {

  name = "inkscape-with-extensions-${lib.getVersion inkscape}";

  inherit (inkscape) version;

  pname = "inkscape-with-extensions";



  outputs = [

    "out"

pkgs/applications/science/math/R/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { 
  + lib.optionalString stdenv.hostPlatform.isDarwin ''

    --disable-R-framework

    --without-x

    --without-static-cairo

    OBJC="clang"

    CPPFLAGS="-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"

    LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib"

pkgs/by-name/al/alliance/package.nix

+15 −13
Original line number Diff line number Diff line
@@ -12,22 +12,21 @@ 
  automake,

  autoconf,

  libtool,

  unstableGitUpdater,

}:



stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

  pname = "alliance";

  version = "unstable-2025-02-24";

  version = "5.1.1-unstable-2025-02-24";



  src =

    let

  src = fetchFromGitHub {

    owner = "lip6";

    repo = "alliance";

    rev = "a8502d32df0a4ad1bd29ab784c4332319669ecd2";

    hash = "sha256-b2uaYZEzHMB3qCMRVANNnjTxr6OYb1Unswxjq5knYzM=";

  };

    in

    "${src}/alliance/src";



  sourceRoot = "${finalAttrs.src.name}/alliance/src";



  nativeBuildInputs = [

    libtool
@@ -70,11 +69,14 @@ stdenv.mkDerivation { 
    cp -p distrib/*.png $out/icons/hicolor/48x48/apps/

  '';



  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };



  meta = {

    description = "(deprecated) Complete set of free CAD tools and portable libraries for VLSI design";

    homepage = "http://coriolis.lip6.fr/";

    license = with lib.licenses; gpl2Plus;

    maintainers = [ ];

    platforms = with lib.platforms; linux;

    broken = true;

  };

}
 
})