Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61a03065fdf5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba947eba043f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 16, 2020

  1. megatools: 1.10.2 -> 1.10.3

    @zowoq
    zowoq committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    siriobalmelli Sirio Balmelli
    GPG key ID: 0437A96EFE4C426E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dc85a2e View commit details

Commits on Apr 17, 2020

  1. Merge pull request #85347 from zowoq/megatools 

    megatools: 1.10.2 -> 1.10.3
    @marsam
    marsam authored Apr 17, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    siriobalmelli Sirio Balmelli
    GPG key ID: 0437A96EFE4C426E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ba947eb View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/tools/networking/megatools/default.nix
10 changes: 5 additions & 5 deletions pkgs/tools/networking/megatools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, glib, fuse, curl, glib-networking
{ stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking
, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "megatools";
version = "1.10.2";
version = "1.10.3";

src = fetchgit {
url = "https://megous.com/git/megatools";
rev = version;
sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk";
rev = "5581d06e447b84d0101d36dc96ab72920eec1017";
sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4";
};

nativeBuildInputs = [
autoreconfHook pkgconfig wrapGAppsHook asciidoc libxml2
autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2
docbook_xsl docbook_xml_dtd_45 libxslt
];
buildInputs = [ glib glib-networking curl ]