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: 8e39110b8536
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: abb5a4eda28d
Choose a head ref
  • 4 commits
  • 7 files changed
  • 2 contributors

Commits on Oct 12, 2019

  1. grafana: 6.4.1 -> 6.4.2

    (cherry picked from commit 0b549a7)
    WilliButz authored and globin committed Oct 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8ed2cba View commit details
  2. atlassian-jira: 8.4.1 -> 8.4.2

    (cherry picked from commit 92bd7a7)
    globin committed Oct 12, 2019
    Copy the full SHA
    bcea361 View commit details
  3. atlassian-confluence: 6.15.8 -> 7.0.2

    (cherry picked from commit c7788ab)
    globin committed Oct 12, 2019
    Copy the full SHA
    b9829cf View commit details
  4. treewide: update some homepage URLs

    Updated dead or redirecting URLs on packages maintained by me.
    
    (cherry picked from commit 4fb5cdd)
    globin committed Oct 12, 2019
    Copy the full SHA
    abb5a4e View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/misc/qlcplus/default.nix
Original file line number Diff line number Diff line change
@@ -40,6 +40,6 @@ mkDerivation rec {
maintainers = [ maintainers.globin ];
license = licenses.asl20;
platforms = platforms.all;
homepage = "http://www.qlcplus.org/";
homepage = "https://www.qlcplus.org/";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/zathura/wrapper.nix
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ in symlinkJoin {
'';

meta = with lib; {
homepage = https://pwmt.org/projects/zathura/;
homepage = https://git.pwmt.org/pwmt/zathura/;
description = "A highly customizable and functional PDF viewer";
longDescription = ''
Zathura is a highly customizable and functional PDF viewer based on the
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/zfs/default.nix
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ let
Copy-On-Write filesystem with data integrity detection and repair,
snapshotting, cloning, block devices, deduplication, and more.
'';
homepage = http://zfsonlinux.org/;
homepage = https://zfsonlinux.org/;
license = licenses.cddl;
platforms = platforms.linux;
maintainers = with maintainers; [ jcumming wizeman fpletz globin ];
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/confluence.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-confluence";
version = "6.15.8";
version = "7.0.2";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "17pcgjv6rj2jxzmwx82941zhrrmprkchjhnnadnxq4709zsyb4q3";
sha256 = "00ma2l6gknlpaf2k26md9fskgzcllky3vv89sb1izsrxl8la1dhq";
};

buildPhase = ''
6 changes: 2 additions & 4 deletions pkgs/servers/atlassian/jira.nix
Original file line number Diff line number Diff line change
@@ -5,15 +5,13 @@

stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.4.1";
version = "8.4.2";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0dkilp5wvda29rin2wj9zs2vgwyfning7cz6dyk0kyg45dl07wky";
sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

buildPhase = ''
mv conf/server.xml conf/server.xml.dist
ln -sf /run/atlassian-jira/server.xml conf/server.xml
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "grafana";
version = "6.4.1";
version = "6.4.2";

goPackagePath = "github.com/grafana/grafana";

@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0z615a885vh92kv9jm6ixhj0i1w0k44wl4rczvp6mcmasbvfb5fb";
sha256 = "12j0lksryggn7lg003ma2cnblclgzdw6b8rhz1wbq8d68m1mq5wv";
};

srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "08y2h7c2zavxwmxlajg2qzfd0lhkj00i2azz5ydm184m38b98kk7";
sha256 = "0ch35h681yq5w7cpys0iiv3kva9hiqxzgk2gp0vcnadzmincwj7c";
};

postPatch = ''
2 changes: 1 addition & 1 deletion pkgs/tools/graphics/scrot/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ];

meta = with stdenv.lib; {
homepage = http://linuxbrit.co.uk/scrot/;
homepage = https://github.com/resurrecting-open-source-projects/scrot;
description = "A command-line screen capture utility";
platforms = platforms.linux;
maintainers = with maintainers; [ globin ];