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

Commits on Sep 30, 2019

  1. apparmor: 2.13.1 -> 2.13.3

    @ajs124
    ajs124 committed Sep 30, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: F3510FE5691629A1
    Learn about vigilant mode
    Copy the full SHA
    751cb47 View commit details

  2. Merge pull request #70043 from ajs124/update/apparmor 

    apparmor: 2.13.1 -> 2.13.3
    @joachifm
    joachifm authored Sep 30, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c79ea99 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/os-specific/linux/apparmor/default.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/apparmor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@

let
apparmor-series = "2.13";
apparmor-patchver = "1";
apparmor-patchver = "3";
apparmor-version = apparmor-series + "." + apparmor-patchver;

apparmor-meta = component: with stdenv.lib; {
@@ -27,7 +27,7 @@ let

apparmor-sources = fetchurl {
url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
sha256 = "7a060d94c275e59f96bacd1da150e6fee2c9152a85bf57800109d07d51ef8afb";
sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16";
};

prePatchCommon = ''