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: a5e5377202e9
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: 7fd23d128b10
Choose a head ref
  • 16 commits
  • 9 files changed
  • 7 contributors

Commits on Jun 14, 2019

  1. google-cloud-sdk: use doBuild = false instead of hardcoding phases 

    We don't want to unpack in installPhase either.
    @flokli
    flokli committed Jun 14, 2019
    Copy the full SHA
    ff647ca View commit details

  2. google-cloud-sdk: apply kubeconfig: don't store absolute path to gclo… 

    …ud binary
    @flokli
    flokli committed Jun 14, 2019
    Copy the full SHA
    6a166b2 View commit details

Commits on Jun 18, 2019

  1. terraform-providers: bump versions 

    I skipped terraform-provider-matchbox and terraform-provider-ansible,
they failed to build:

terraform-provider-ansible
> cannot find package "github.com/hashicorp/terraform/helper/schema" …

terraform-provider-matchbox
> cannot find package "github.com/poseidon/terraform-provider-matchbox/matchbox" …
    @flokli
    flokli committed Jun 18, 2019
    Copy the full SHA
    c0f1c81 View commit details

  2. xmr-stak: 2.10.4 -> 2.10.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xmr-stak/versions
    @r-ryantm
    r-ryantm committed Jun 18, 2019
    Copy the full SHA
    5170d0b View commit details

  3. yarn: 1.16.0 -> 1.17.0 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yarn/versions
    @r-ryantm
    r-ryantm committed Jun 18, 2019
    Copy the full SHA
    cf081b2 View commit details

  4. gvfs: fix CVE-2019-1244{7.8.9} 

    This is a version of #63481 for master.

CVE-2019-12447:
daemon/gvfsbackendadmin.c mishandles file ownership because setfsuid is
not used.

CVE-2019-12448:
daemon/gvfsbackendadmin.c has race conditions because the admin backend
doesn't implement query_info_on_read/write.

CVE-2019-12449:
daemon/gvfsbackendadmin.c mishandles a file's user and group ownership
during move (and copy with G_FILE_COPY_ALL_METADATA) operations
from admin:// to file:// URIs, because root privileges are unavailable.

Upstream MR: https://gitlab.gnome.org/GNOME/gvfs/merge_requests/48
    @worldofpeace
    worldofpeace committed Jun 18, 2019
    Copy the full SHA
    02ea0d3 View commit details

  5. gvfs: fix CVE-2019-12795 

    This is a version of #63481 for master.

Vulnerability Description:
daemon/gvfsdaemon.c in gvfsd from GNOME gvfs before 1.38.3, 1.40.x before
1.40.2, and 1.41.x before 1.41.3 opened a private D-Bus server socket without
configuring an authorization rule. A local attacker could connect to this server
socket and issue D-Bus method calls. Note that the server socket only accepts
a single connection, so the attacker would have to discover the server and connect
to the socket before its owner does.

#63301
    @worldofpeace
    worldofpeace committed Jun 18, 2019
    Copy the full SHA
    fae9e16 View commit details

Commits on Jun 19, 2019

  1. gnome3.tracker-miners: enable auto_features 

    When tracker-miners switched from booleans to features, we were no longer building
majority of the miners, since we disable auto_features by default.
    @jtojnar
    jtojnar committed Jun 19, 2019
    Copy the full SHA
    6d8eaf8 View commit details

  2. Merge pull request #63472 from r-ryantm/auto-update/yarn 

    yarn: 1.16.0 -> 1.17.0
    @marsam
    marsam authored Jun 19, 2019
    Copy the full SHA
    6999418 View commit details

  3. Merge pull request #63470 from r-ryantm/auto-update/xmr-stak 

    xmr-stak: 2.10.4 -> 2.10.5
    @marsam
    marsam authored Jun 19, 2019
    Copy the full SHA
    3dfdb3f View commit details

  4. gnome3.tracker-miners: enable auto_features (#63491) 

    gnome3.tracker-miners: enable auto_features
    @jtojnar
    jtojnar authored Jun 19, 2019
    Copy the full SHA
    e0a21aa View commit details

  5. Merge pull request #63486 from worldofpeace/gvfs/security-fixes-unstable 

    gvfs: security fixes
    @worldofpeace
    worldofpeace authored Jun 19, 2019
    Copy the full SHA
    9d17311 View commit details

  6. cum: init at 0.9.1

    @tadeokondrak
    tadeokondrak committed Jun 19, 2019
    Copy the full SHA
    6c167ab View commit details

  7. terraform-providers: bump versions (#63463) 

    terraform-providers: bump versions
    @flokli
    flokli authored Jun 19, 2019
    Copy the full SHA
    a5853e4 View commit details

  8. google-cloud-sdk: kubeconfig: don't store absolute path to gcloud bin… 

    …ary (#63037)

google-cloud-sdk: kubeconfig: don't store absolute path to gcloud binary
    @flokli
    flokli authored Jun 19, 2019
    Copy the full SHA
    fbfcc15 View commit details

  9. Merge pull request #63498 from tadeokondrak/cum/init/0.9.1 

    cum: init at 0.9.1
    @etu
    etu authored Jun 19, 2019
    Copy the full SHA
    7fd23d1 View commit details
36 changes: 36 additions & 0 deletions pkgs/applications/misc/cum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ stdenv, python3Packages }:

with python3Packages;

buildPythonApplication rec {
pname = "cum";
version = "0.9.1";

src = fetchPypi {
inherit pname version;
sha256 = "15qc6agka2g3kcnpnz0hbjic1s3260cr9bda0rlcyninxs1vndq0";
};

propagatedBuildInputs = [
alembic beautifulsoup4 click natsort requests sqlalchemy
];

# tests seem to fail for `config` not being defined,
# but it works once installed
doCheck = false;

# remove the top-level `tests` and `LICENSE` file
# they should not be installed, and there can be issues if another package
# has a collision (especially with the license file)
postInstall = ''
rm -rf $out/tests $out/LICENSE
'';

meta = with stdenv.lib; {
description = "comic updater, mangafied";
homepage = "https://github.com/Hamuko/cum";
license = licenses.asl20;
maintainers = with maintainers; [ tadeokondrak ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xmr-stak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ in

stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
version = "2.10.4";
version = "2.10.5";

src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = "${version}";
sha256 = "0f3cs0jw0yn8lbcm43m34dnvvgr4qpb8wa176vh4whk7bbjkw7lz";
sha256 = "16b6bj0rsr3cq9x3gxm54j197827d8lnfk7ghfjmaf7qa3q08adx";
};

NIX_CFLAGS_COMPILE = "-O3";
Loading