Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 548d0b73f2b8
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f20bc852a55d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 27, 2019

  1. mucommander: 0.9.2 -> 0.9.3-3 

    Mucommander 0.9.3-3 was released in January 2019.

* comment out `proguard.enabled = ...` in build.gradle
* use Gradle 4.10 (upstream uses 4.8)
* fix version in build.gradle
    @avdv
    avdv committed Sep 27, 2019
    Copy the full SHA
    c32862d View commit details

Commits on Sep 29, 2019

  1. Merge pull request #69633 from avdv/backport-mucommander-69280 

    mucommander: 0.9.2 -> 0.9.3-3
    @Ma27
    Ma27 authored Sep 29, 2019
    Copy the full SHA
    f20bc85 View commit details
Showing with 10 additions and 8 deletions.
  1. +10 −8 pkgs/applications/misc/mucommander/default.nix
18 changes: 10 additions & 8 deletions pkgs/applications/misc/mucommander/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }:
{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }:

let
version = "0.9.2";
version = "0.9.3-3";
name = "mucommander-${version}";

src = fetchFromGitHub {
owner = "mucommander";
repo = "mucommander";
rev = version;
sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8";
sha256 = "1zhglsx3b5k6np3ppfkkrqz9wg0j7ip598xxfgn75gjl020w0can";
};

postPatch = ''
# there is no .git anyway
substituteInPlace build.gradle \
--replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \
--replace "revision = git.head().id" "revision = 'abcdefgh'"
--replace "revision = git.head().id" "revision = 'abcdefgh'" \
--replace "proguard.enabled =" "// proguard.enabled =" \
--replace "version = '0.9.4'" "version = '${version}'"
# disable gradle plugins with native code and their targets
perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
@@ -34,7 +36,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src postPatch;
nativeBuildInputs = [ gradle_3_5 perl ];
nativeBuildInputs = [ gradle_4_10 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon build
@@ -47,12 +49,12 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7";
outputHash = "1v5a76pvk7llbyv2rg50wlxc2wf468l2cslz1vi20aihycbyky7j";
};

in stdenv.mkDerivation {
inherit name src postPatch;
nativeBuildInputs = [ gradle_3_5 perl makeWrapper ];
nativeBuildInputs = [ gradle_4_10 perl makeWrapper ];

buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -63,7 +65,7 @@ in stdenv.mkDerivation {
repositories { mavenLocal(); maven { url '${deps}' } }
#" {} \;
gradle --offline --no-daemon build
gradle --offline --no-daemon distTar
'';

installPhase = ''