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: 161927b1b1b1
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: 5bcc6cecb355
Choose a head ref
  • 8 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 1, 2019

  1. gpac: 0.7.1 -> 0.8.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/gpac/versions
    @r-ryantm
    r-ryantm committed Jul 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    903a465 View commit details

Commits on Jul 2, 2019

  1. python37Packages.deap: 1.2.2 -> 1.3.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/python3.7-deap/versions
    @r-ryantm
    r-ryantm committed Jul 2, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    234bf65 View commit details

  2. python37Packages.owslib: 0.17.1 -> 0.18.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/python3.7-owslib/versions
    @r-ryantm
    r-ryantm committed Jul 2, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    569a11b View commit details

Commits on Jul 13, 2019

  1. prometheus_2: 2.11.0 -> 2.11.1

    @marsam
    marsam committed Jul 13, 2019

    Partially verified

    This commit is signed with the committer’s verified signature.
    vcunat’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    338b4c5 View commit details

Commits on Jul 15, 2019

  1. Merge pull request #64129 from r-ryantm/auto-update/python3.7-deap 

    python37Packages.deap: 1.2.2 -> 1.3.0
    @marsam
    marsam authored Jul 15, 2019
    Copy the full SHA
    432f1de View commit details

  2. Merge pull request #64708 from marsam/update-prometheus_2 

    prometheus_2: 2.11.0 -> 2.11.1
    @marsam
    marsam authored Jul 15, 2019
    Copy the full SHA
    b1554dd View commit details

  3. Merge pull request #64143 from r-ryantm/auto-update/python3.7-OWSLib 

    python37Packages.owslib: 0.17.1 -> 0.18.0
    @marsam
    marsam authored Jul 15, 2019
    Copy the full SHA
    0ba75fb View commit details

  4. Merge pull request #64041 from r-ryantm/auto-update/gpac 

    gpac: 0.7.1 -> 0.8.0
    @marsam
    marsam authored Jul 15, 2019
    Copy the full SHA
    5bcc6ce View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/applications/video/gpac/default.nix
  2. +2 −2 pkgs/development/python-modules/owslib/default.nix
  3. +2 −2 pkgs/servers/monitoring/prometheus/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/video/gpac/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pkgconfig, zlib }:

stdenv.mkDerivation rec {
version = "0.7.1";
version = "0.8.0";
name = "gpac-${version}";

src = fetchFromGitHub {
owner = "gpac";
repo = "gpac";
rev = "v${version}";
sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q";
sha256 = "1w1dyrn6900yi8ngchfzy5hvxr6yc60blvdq8y8mczimmmq8khb5";
};

# this is the bare minimum configuration, as I'm only interested in MP4Box
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/owslib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest } :
buildPythonPackage rec {
pname = "OWSLib";
version = "0.17.1";
version = "0.18.0";

src = fetchPypi {
inherit pname version;
sha256 = "19dm6dxj9hsiq0bnb4d6ms3sh2hcss9d9fhpjgkwxzrw9mlzvrxj";
sha256 = "018p2ypmpbbcgl0hp92s0vig1wirh41lj0wy62aafn5050pmqr7m";
};

buildInputs = [ pytest ];
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/prometheus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ in rec {
};

prometheus_2 = buildPrometheus {
version = "2.11.0";
sha256 = "0x5q2zv8nvqdns8780rsbdhv44azg1fz631ji2rlmiy1l6n1q3hb";
version = "2.11.1";
sha256 = "1d4kiv88v1p74cm1wg6wk1cs963xg2rlhkxw86slf9hmldlgww2l";
};
}