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

Commits on Nov 4, 2019

  1. pythonPackages.koji: 1.13.0 -> 1.14.3 (security) 

    Addressing CVE-2019-17109

Also added missing description, homepage & license. Re-disabled for py3k
as the kojira executable doesn't seem to be happy with it.

(cherry picked from commit 605a7b3)
    @risicle
    risicle committed Nov 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f52497d View commit details

Commits on Nov 5, 2019

  1. Merge pull request #72793 from risicle/ris-koji-1.14.3-r19.09 

    [r19.09] pythonPackages.koji: 1.13.0 -> 1.14.3 (security)
    @Ekleog
    Ekleog authored Nov 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2719e06 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/python-modules/koji/default.nix
12 changes: 7 additions & 5 deletions pkgs/development/python-modules/koji/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, buildPythonPackage, pycurl, six, rpm, dateutil }:
{ stdenv, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }:

buildPythonPackage rec {
pname = "koji";
version = "1.13.0";
version = "1.14.3";
format = "other";

src = fetchurl {
url = "https://releases.pagure.org/koji/${pname}-${version}.tar.bz2";
sha256 = "18b18rcbdqqw33g7h20hf5bpbci2ixdi05yda1fvpv30c1kkzd8w";
sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40";
};

propagatedBuildInputs = [ pycurl six rpm dateutil ];

# Judging from SyntaxError
#disabled = isPy3k;
disabled = isPy3k;

makeFlags = "DESTDIR=$(out)";

@@ -24,7 +24,9 @@ buildPythonPackage rec {
'';

meta = {
maintainers = [ ];
description = "An RPM-based build system";
homepage = https://pagure.io/koji;
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix;
};
}