From 9b10422a8043f8fd994bed6030954b52386bd43f Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 26 Apr 2024 08:58:19 +0100 Subject: remnote: 1.15.4 -> 1.16.4 --- pkgs/applications/misc/remnote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index d9028d8876db1..198922f1876c8 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.15.4"; + version = "1.16.4"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-6WBdTOj/seinx1wJGb/4if3PzCPmtzHyNAFmQwmsrvE="; + hash = "sha256-dgbQ0cbPq7BSQ9VwwH6+GoAxb85HDxRixfjeDJBtOrg="; }; appexec = appimageTools.wrapType2 { -- cgit 1.4.1 From 5cb77278a438a9b6d497758caa3dcd0a8e795925 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:42:08 +0900 Subject: mafft: 7.525 -> 7.526 Diff: https://gitlab.com/sysimm/mafft/-/compare/v7.525...v7.526 --- pkgs/applications/science/biology/mafft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix index f2e3ead2e913c..bc9ab7ad79b3a 100644 --- a/pkgs/applications/science/biology/mafft/default.nix +++ b/pkgs/applications/science/biology/mafft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mafft"; - version = "7.525"; + version = "7.526"; src = fetchFromGitLab { owner = "sysimm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ckBmvFssYAmYcBHAEftjQqBV0MB0theGfemaPx3XUws="; + sha256 = "sha256-VNe00r12qEkLEbpZdJCe5xZ73JA3uAmuAeG+eSeRDI0="; }; preBuild = '' -- cgit 1.4.1 From 4b3081c5e0de5638f547c31c7e1e5b901a50ce88 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:45:46 +0900 Subject: mafft: prettify --- .../applications/science/biology/mafft/default.nix | 36 +++++++++++++--------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix index bc9ab7ad79b3a..b003bb98b5f9d 100644 --- a/pkgs/applications/science/biology/mafft/default.nix +++ b/pkgs/applications/science/biology/mafft/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitLab }: +{ + lib, + stdenv, + fetchFromGitLab, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mafft"; version = "7.526"; src = fetchFromGitLab { owner = "sysimm"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-VNe00r12qEkLEbpZdJCe5xZ73JA3uAmuAeG+eSeRDI0="; + repo = "mafft"; + rev = "v${finalAttrs.version}"; + hash = "sha256-VNe00r12qEkLEbpZdJCe5xZ73JA3uAmuAeG+eSeRDI0="; }; preBuild = '' @@ -16,14 +20,16 @@ stdenv.mkDerivation rec { make clean ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "PREFIX=$(out)" + ]; - meta = with lib; - { - description = "Multiple alignment program for amino acid or nucleotide sequences"; - homepage = "https://mafft.cbrc.jp/alignment/software/"; - license = licenses.bsd3; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; - }; -} + meta = with lib; { + description = "Multiple alignment program for amino acid or nucleotide sequences"; + homepage = "https://mafft.cbrc.jp/alignment/software/"; + license = licenses.bsd3; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +}) -- cgit 1.4.1 From ce0af18702c144542ff7017d568d6b16c6498e9c Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 28 Apr 2024 13:57:47 +0900 Subject: mafft: enable simple test --- pkgs/applications/science/biology/mafft/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix index b003bb98b5f9d..ca1f89388a442 100644 --- a/pkgs/applications/science/biology/mafft/default.nix +++ b/pkgs/applications/science/biology/mafft/default.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitLab, + runCommand, + mafft, }: stdenv.mkDerivation (finalAttrs: { @@ -25,6 +27,24 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=$(out)" ]; + passthru.tests = { + simple = runCommand "${finalAttrs.pname}-test" { } '' + mkdir $out + cd ${finalAttrs.src}/test + ${lib.getExe mafft} sample > $out/test.fftns2 + ${lib.getExe mafft} --maxiterate 100 sample > $out/test.fftnsi + ${lib.getExe mafft} --globalpair sample > $out/test.gins1 + ${lib.getExe mafft} --globalpair --maxiterate 100 sample > $out/test.ginsi + ${lib.getExe mafft} --localpair sample > $out/test.lins1 + ${lib.getExe mafft} --localpair --maxiterate 100 sample > $out/test.linsi + diff $out/test.fftns2 sample.fftns2 + diff $out/test.fftnsi sample.fftnsi + diff $out/test.gins1 sample.gins1 + diff $out/test.ginsi sample.ginsi + diff $out/test.lins1 sample.lins1 + ''; + }; + meta = with lib; { description = "Multiple alignment program for amino acid or nucleotide sequences"; homepage = "https://mafft.cbrc.jp/alignment/software/"; -- cgit 1.4.1 From 3faef425650568520e7df6751a2fddc349227f18 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 Apr 2024 16:13:25 +0200 Subject: buildMozillaMach: stop polluting the hg tree Moves the MOZ_OBJDIR into a path that is ignored through .hgignore, and the MOZBUILD_STATE_PATH outside of the source root. Closes: #306937 --- pkgs/applications/networking/browsers/firefox/common.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5166fdf85153a..745cd9ee55184 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -308,8 +308,8 @@ buildStdenv.mkDerivation { export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt) # Set predictable directories for build and state - export MOZ_OBJDIR=$(pwd)/mozobj - export MOZBUILD_STATE_PATH=$(pwd)/mozbuild + export MOZ_OBJDIR=$(pwd)/objdir + export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild # Don't try to send libnotify notifications during build export MOZ_NOSPAM=1 @@ -353,7 +353,7 @@ buildStdenv.mkDerivation { # since the profiling build has not been installed to $out '' OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}" + LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}" ''} fi '' + lib.optionalString googleAPISupport '' @@ -510,7 +510,7 @@ buildStdenv.mkDerivation { ''; preBuild = '' - cd mozobj + cd objdir ''; postBuild = '' @@ -535,9 +535,9 @@ buildStdenv.mkDerivation { preInstall = lib.optionalString crashreporterSupport '' ./mach buildsymbols mkdir -p $symbols/ - cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ + cp objdir/dist/*.crashreporter-symbols.zip $symbols/ '' + '' - cd mozobj + cd objdir ''; postInstall = '' -- cgit 1.4.1 From cf1efbbe1959bf47af4261107e52c0ddfcbc283f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 Apr 2024 16:13:44 +0200 Subject: buildMozillaMach: stop deleting the configure script They're not autogenerated files any longer, and have been shipped as part of the source tree since roughly Aug 2022. Related: mozbz#1787977 ("Include configure in the tree") Closes: #306937 --- pkgs/applications/networking/browsers/firefox/common.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 745cd9ee55184..4483cd31bd653 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -298,9 +298,6 @@ buildStdenv.mkDerivation { setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags. preConfigure = '' - # remove distributed configuration files - rm -f configure js/src/configure .mozconfig* - # Runs autoconf through ./mach configure in configurePhase configureScript="$(realpath ./mach) configure" -- cgit 1.4.1