cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #296774 from Kupac/upgrade-salmon

Browse source 
salmon: 1.10.2 -> 1.10.3
This commit is contained in:
Weijia Wang 2024-03-18 06:07:37 +01:00 committed by GitHub
commit 3d837aa34b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/by-name/sa/salmon/fetch-pufferfish.patch
View file

@ -1,5 +1,5 @@
diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh diff --git a/scripts/fetchPufferfish.sh b/scripts/fetchPufferfish.sh
index bf2574e0..42582806 100755 index 95e30053..8866767c 100755
--- a/scripts/fetchPufferfish.sh --- a/scripts/fetchPufferfish.sh
+++ b/scripts/fetchPufferfish.sh +++ b/scripts/fetchPufferfish.sh
@@ -11,10 +11,6 @@ CURR_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) @@ -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 rm -fr ${INSTALL_DIR}/src/pufferfish
fi fi
-SVER=salmon-v1.10.2 -SVER=salmon-v1.10.3
-#SVER=develop -#SVER=develop
-#SVER=sketch-mode -#SVER=sketch-mode
- -
-EXPECTED_SHA256=f225b74833f71dcf767a565345224357fb091f90ce79717abc836814d9ccd101 -EXPECTED_SHA256=52b6699de0d33814b73edb3455175568c2330d8014be017dce7b564e54134860
- -
-mkdir -p ${EXTERNAL_DIR} -mkdir -p ${EXTERNAL_DIR}
-curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip -curl -k -L https://github.com/COMBINE-lab/pufferfish/archive/${SVER}.zip -o ${EXTERNAL_DIR}/pufferfish.zip

6
pkgs/by-name/sa/salmon/package.nix
View file

@ -20,20 +20,20 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "salmon"; pname = "salmon";
version = "1.10.2"; version = "1.10.3";
pufferFishSrc = fetchFromGitHub { pufferFishSrc = fetchFromGitHub {
owner = "COMBINE-lab"; owner = "COMBINE-lab";
repo = "pufferfish"; repo = "pufferfish";
rev = "salmon-v${finalAttrs.version}"; rev = "salmon-v${finalAttrs.version}";
hash = "sha256-JKbUFBEsqnENl4vFqve1FCd4TI3n9bRi2RNHC8QGQGc="; hash = "sha256-g4pfNuc620WQ7UDv8PQHVbbTVt78aGVqcHHMszmBIkA=";
}; };
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "COMBINE-lab"; owner = "COMBINE-lab";
repo = "salmon"; repo = "salmon";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-kwqoUmVCqjr/xRxJjQKaFjjCQW+MFASHJ2f9OiAumNU="; hash = "sha256-HGcDqu0XzgrU3erHavigXCoj3VKk82ixMLY10Kk9MW4=";
}; };
patches = [ patches = [