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: ffa1088b6cab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83d1eac6b2a8
Choose a head ref
  • 10 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 30, 2017

  1. hotspot: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    053db94 View commit details

  2. openshot-qt: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    446ff70 View commit details

  3. sigil: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    6f0a287 View commit details

  4. goldendict: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    f9bd7a2 View commit details

  5. luminanceHDR: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    ec112ef View commit details

  6. smtube: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    a4ce084 View commit details

  7. notepadqq: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    c606849 View commit details

  8. rapcad: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    e7a7d2b View commit details

  9. redis-desktop-manager: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    f21f6f1 View commit details

  10. trojita: use default Qt 5

    @globin
    globin committed Jul 30, 2017
    Copy the full SHA
    83d1eac View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 pkgs/top-level/all-packages.nix
20 changes: 10 additions & 10 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2491,7 +2491,7 @@ with pkgs;

host = bind.host;

hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { };
hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };

hping = callPackage ../tools/networking/hping { };

@@ -4236,7 +4236,7 @@ with pkgs;

siege = callPackage ../tools/networking/siege {};

sigil = libsForQt56.callPackage ../applications/editors/sigil { };
sigil = libsForQt5.callPackage ../applications/editors/sigil { };

# aka., pgp-tools
signing-party = callPackage ../tools/security/signing-party { };
@@ -5732,7 +5732,7 @@ with pkgs;
jre = jre8;
jre_headless = jre8_headless;

openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { };
openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };

oraclejdk = pkgs.jdkdistro true false;

@@ -14290,7 +14290,7 @@ with pkgs;

gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };

goldendict = libsForQt56.callPackage ../applications/misc/goldendict { };
goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };

inherit (ocamlPackages) google-drive-ocamlfuse;

@@ -15166,7 +15166,7 @@ with pkgs;

lrzsz = callPackage ../tools/misc/lrzsz { };

luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { };
luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };

lxdvdrip = callPackage ../applications/video/lxdvdrip { };

@@ -15496,7 +15496,7 @@ with pkgs;

smplayer = libsForQt5.callPackage ../applications/video/smplayer { };

smtube = libsForQt56.callPackage ../applications/video/smtube {};
smtube = libsForQt5.callPackage ../applications/video/smtube {};

sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };

@@ -15573,7 +15573,7 @@ with pkgs;

nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };

notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { };
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };

notmuch = callPackage ../applications/networking/mailreaders/notmuch { };

@@ -15961,7 +15961,7 @@ with pkgs;
demo = false;
};

rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; };
rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; };

rapidsvn = callPackage ../applications/version-management/rapidsvn { };

@@ -16505,7 +16505,7 @@ with pkgs;

tribler = callPackage ../applications/networking/p2p/tribler { };

trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { };
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };

tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };

@@ -18869,7 +18869,7 @@ with pkgs;
pcre = pcre-cpp;
});

redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { };
redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { };

robomongo = callPackage ../applications/misc/robomongo { };