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

Commits on Jan 6, 2020

  1. cups: 2.3.0 -> 2.3.1

    @r-ryantm
    r-ryantm committed Jan 6, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84457be View commit details

Commits on Jan 20, 2020

  1. Merge pull request #77017 from r-ryantm/auto-update/cups 

    cups: 2.3.0 -> 2.3.1
    @nh2
    nh2 authored Jan 20, 2020
    Copy the full SHA
    7ebadfe View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/misc/cups/default.nix
4 changes: 2 additions & 2 deletions pkgs/misc/cups/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,15 +30,15 @@ stdenv.mkDerivation rec {
pname = "cups";

# After 2.2.6, CUPS requires headers only available in macOS 10.12+
version = if stdenv.isDarwin then "2.2.6" else "2.3.0";
version = if stdenv.isDarwin then "2.2.6" else "2.3.1";

passthru = { inherit version; };

src = fetchurl {
url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
sha256 = if version == "2.2.6"
then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
else "19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc";
else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv";
};

outputs = [ "out" "lib" "dev" "man" ];