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

Commits on Jul 29, 2017

  1. linuxPackages.acpi_call: add patch for 4.12 compat

    @fpletz
    fpletz committed Jul 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65f9631 View commit details

  2. atlassian-confluence: 6.2.2 -> 6.3.1

    @fpletz
    fpletz committed Jul 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    96a40ec View commit details

  3. atlassian-jira: 7.3.7 -> 7.4.1

    @fpletz
    fpletz committed Jul 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e37274e View commit details
Showing with 12 additions and 5 deletions.
  1. +8 −1 pkgs/os-specific/linux/acpi-call/default.nix
  2. +2 −2 pkgs/servers/atlassian/confluence.nix
  3. +2 −2 pkgs/servers/atlassian/jira.nix
9 changes: 8 additions & 1 deletion pkgs/os-specific/linux/acpi-call/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, kernel }:
{ stdenv, fetchgit, fetchpatch, kernel }:

stdenv.mkDerivation {
name = "acpi-call-${kernel.version}";
@@ -9,6 +9,13 @@ stdenv.mkDerivation {
sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75";
};

patches = [
(fetchpatch {
url = "https://github.com/mkottman/acpi_call/pull/67.patch";
sha256 = "0z07apvdl8nvl8iwfk1sl1iidfjyx12fc0345bmp2nq1537kpbri";
})
];

hardeningDisable = [ "pic" ];

preBuild = ''
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "atlassian-confluence-${version}";
version = "6.2.2";
version = "6.3.1";

src = fetchurl {
url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
sha256 = "1fpn799382m8x7b0s3w4mxzlhy1s62ya287i622gbadqscprhagg";
sha256 = "0f7hc8q4sigvr9bdxx8phnp6bkfkz9bccwkrx0xqyrvvdc5x5690";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "7.3.7";
version = "7.4.1";

src = fetchurl {
url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "1ixnnw3yj2ip9ndr9pwxcmdy8gaixkmp517ahg3w8xzymr8wh2qp";
sha256 = "1ixkhc206z3zpiaj46v8z2gxmix24sxqs2d17fb64gkyml9s5gqb";
};

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