Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e1afc39b483c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba7a81a0f38f
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Jul 2, 2020

  1. [20.03] ceph: 14.2.9 -> 14.2.10 

    Add new dependency on rdkafka
Also removed now-obsolete cve patch as it's integrated already

(cherry picked from commit a1f6898)
Backport of #91919
    @srhb
    srhb committed Jul 2, 2020
    Copy the full SHA
    b1a39c0 View commit details

  2. Merge pull request #91989 from srhb/backport-ceph-14.2.10 

    [20.03] ceph: 14.2.9 -> 14.2.10
    @srhb
    srhb authored Jul 2, 2020
    Copy the full SHA
    1af2655 View commit details

  3. freerdp: 2.1.0 -> 2.1.1 

    (cherry picked from commit ed73bb8)
    @lheckemann
    lheckemann committed Jul 2, 2020
    Copy the full SHA
    d695d9b View commit details

  4. freerdp: 2.1.1 -> 2.1.2 

    (cherry picked from commit b30ecf0)
    @r-ryantm @lheckemann
    r-ryantm authored and lheckemann committed Jul 2, 2020
    Copy the full SHA
    ba7a81a View commit details
Showing with 6 additions and 11 deletions.
  1. +2 −2 pkgs/applications/networking/remote/freerdp/default.nix
  2. +4 −9 pkgs/tools/filesystems/ceph/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/remote/freerdp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,13 +17,13 @@ let

in stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.1.0";
version = "2.1.2";

src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "0905374k4x647052sr27m2hgjcavbxdl0xd8n02vm5xa6whz239j";
sha256 = "1yvi7zd0ic0rv7njd0wi9q1mfvz4d9qrx3i45dd6hcq465wg8dp7";
};

postPatch = ''
13 changes: 4 additions & 9 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
, rocksdb, makeWrapper
, leveldb, oathToolkit
, libnl, libcap_ng
, rdkafka

# Optional Dependencies
, yasm ? null, fcgi ? null, expat ? null
@@ -93,25 +94,19 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;

version = "14.2.9";
version = "14.2.10";
in rec {
ceph = stdenv.mkDerivation {
pname = "ceph";
inherit version;

src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il";
sha256 = "0bbs3ag8zav283qpxrrndhvh2z01ykm6126fmwrbc1c5f9jfjq39";
};

patches = [
./0000-fix-SPDK-build-env.patch
(fetchurl {
# Remove for Ceph > v15.2.3; https://www.openwall.com/lists/oss-security/2020/06/25/5
name = "CVE-2020-10753.patch";
url = "https://github.com/ceph/ceph/pull/35773/commits/1524d3c0c5cb11775313ea1e2bb36a93257947f2.patch";
sha256 = "1c04kirijp4c8a5pgwqx17dzdnzvd29nl2nr3qdvf4fkqwnlf48s";
})
];

nativeBuildInputs = [
@@ -124,7 +119,7 @@ in rec {
buildInputs = cryptoLibsMap.${cryptoStr} ++ [
boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3
malloc zlib openldap lttng-ust babeltrace gperf gtest cunit
snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng
snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka
] ++ optionals stdenv.isLinux [
linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs
# ceph 14