Unverified Commit 3d837aa3 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #296774 from Kupac/upgrade-salmon 

salmon: 1.10.2 -> 1.10.3
parents 8a9307b5 b360ff93

pkgs/by-name/sa/salmon/fetch-pufferfish.patch

+3 −3
Original line number Diff line number Diff line 
diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh

index bf2574e0..42582806 100755

index 95e30053..8866767c 100755

--- a/scripts/fetchPufferfish.sh

+++ b/scripts/fetchPufferfish.sh

@@ -11,10 +11,6 @@ CURR_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
@@ -17,11 +17,11 @@ index bf2574e0..42582806 100755 
     rm -fr ${INSTALL_DIR}/src/pufferfish

 fi

 

-SVER=salmon-v1.10.2

-SVER=salmon-v1.10.3

-#SVER=develop

-#SVER=sketch-mode

-

-EXPECTED_SHA256=f225b74833f71dcf767a565345224357fb091f90ce79717abc836814d9ccd101

-EXPECTED_SHA256=52b6699de0d33814b73edb3455175568c2330d8014be017dce7b564e54134860 

-

-mkdir -p ${EXTERNAL_DIR}

-curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip

pkgs/by-name/sa/salmon/package.nix

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


stdenv.mkDerivation (finalAttrs: {

  pname = "salmon";

  version = "1.10.2";

  version = "1.10.3";



  pufferFishSrc = fetchFromGitHub {

    owner = "COMBINE-lab";

    repo = "pufferfish";

    rev = "salmon-v${finalAttrs.version}";

    hash = "sha256-JKbUFBEsqnENl4vFqve1FCd4TI3n9bRi2RNHC8QGQGc=";

    hash = "sha256-g4pfNuc620WQ7UDv8PQHVbbTVt78aGVqcHHMszmBIkA=";

  };



  src = fetchFromGitHub {

    owner = "COMBINE-lab";

    repo = "salmon";

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

    hash = "sha256-kwqoUmVCqjr/xRxJjQKaFjjCQW+MFASHJ2f9OiAumNU=";

    hash = "sha256-HGcDqu0XzgrU3erHavigXCoj3VKk82ixMLY10Kk9MW4=";

  };



  patches = [