Unverified Commit c0bb0690 authored by David McFarland's avatar David McFarland Committed by GitHub
Browse files

treewide: avoid running dotnet fetch-deps script twice (#388989)

parents 24c52db6 09d7af29

pkgs/by-name/av/avalonia/update.bash

+2 −1
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ 


set -euo pipefail



export NIXPKGS_ALLOW_INSECURE=1 # uses EOL dotnet-sdk-7

package="$UPDATE_NIX_ATTR_PATH"

nix-update "$package"

nix-update "$package" --src-only

src=$(nix-build -A "$package".src --no-out-link)

npmDepsFile=$(nix-instantiate --eval -A "$package".npmDepsFile)

(

pkgs/by-name/fs/fsautocomplete/package.nix

+1 −5
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  fetchFromGitHub,

  dotnetCorePackages,

  testers,

  _experimental-update-script-combinators,

  nix-update-script,

}:
@@ -38,10 +37,7 @@ buildDotnetModule (finalAttrs: { 


  passthru = {

    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

    updateScript = _experimental-update-script-combinators.sequence [

      (nix-update-script { })

      finalAttrs.passthru.fetch-deps

    ];

    updateScript = nix-update-script { };

  };



  meta = with lib; {

pkgs/by-name/kr/kryptor/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchFromGitHub,

  dotnetCorePackages,

  versionCheckHook,

  nix-update-script,

}:



buildDotnetModule rec {
@@ -27,7 +28,7 @@ buildDotnetModule rec { 
  nativeInstallCheckInputs = [ versionCheckHook ];



  passthru = {

    updateScript = ./update.sh;

    updateScript = nix-update-script { };

  };



  meta = {

pkgs/by-name/kr/kryptor/update.sh

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell --pure -i bash -p bash nix nix-update git cacert

set -euo pipefail



nix-update kryptor

$(nix-build . -A kryptor.fetch-deps --no-out-link)

pkgs/by-name/lu/lumafly/package.nix

+2 −11
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  icoutils,

  copyDesktopItems,

  makeDesktopItem,

  writeScript,

  nix-update-script,

}:

buildDotnetModule rec {

  pname = "lumafly";
@@ -34,16 +34,7 @@ buildDotnetModule rec { 


  selfContainedBuild = true;



  passthru.updateScript = writeScript "update-lumafly" ''

    #!/usr/bin/env nix-shell

    #!nix-shell --pure -i bash -p bash nix nix-update git cacert

    set -eo pipefail



    prev_version=$(nix eval --raw -f. lumafly.version)

    nix-update lumafly

    [[ $(nix eval --raw -f. lumafly.version) == "$prev_version" ]] ||

      $(nix-build . -A lumafly.fetch-deps --no-out-link)

  '';

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



  runtimeDeps = [

    zlib