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: 18006f8edc79
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: b4c9f8d0358a
Choose a head ref
  • 8 commits
  • 4 files changed
  • 6 contributors

Commits on Aug 24, 2018

  1. qpdf: 8.1.0 -> 8.2.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qpdf/versions.
    R. RyanTM committed Aug 24, 2018
    Copy the full SHA
    66540ba View commit details

Commits on Aug 27, 2018

  1. upx: 3.94 -> 3.95

    @dtzWill
    dtzWill committed Aug 27, 2018
    Copy the full SHA
    da8e3ef View commit details

Commits on Aug 28, 2018

  1. linux-hardkernel: 4.14.55-146 -> 4.14.66-147

    @qolii
    qolii committed Aug 28, 2018
    Copy the full SHA
    5d0e53f View commit details

  2. obliv-c: 0.0pre20170827 -> 0.0pre20180624

    @vbgl
    vbgl committed Aug 28, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    GPG key ID: EBD582ADDDB1F81F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    38fafd1 View commit details

  3. Merge pull request #45689 from qolii/hardkernel_4_14_55__4_14_66 

    linux-hardkernel: 4.14.55-146 -> 4.14.66-147
    @adisbladis
    adisbladis authored Aug 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    503235e View commit details

  4. Merge pull request #45678 from dtzWill/update/upx-3.95 

    upx: 3.94 -> 3.95
    @adisbladis
    adisbladis authored Aug 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cbecd29 View commit details

  5. Merge pull request #45543 from r-ryantm/auto-update/qpdf 

    qpdf: 8.1.0 -> 8.2.1
    @adisbladis
    adisbladis authored Aug 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ccd82c View commit details

  6. Merge pull request #45691 from vbgl/oblivc-20180624 

    obliv-c: 0.0pre20170827 -> 0.0pre20180624
    @srhb
    srhb authored Aug 28, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b4c9f8d View commit details
6 changes: 3 additions & 3 deletions pkgs/development/compilers/obliv-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
stdenv.mkDerivation rec {
name = "obliv-c-${version}";
version = "0.0pre20170827";
version = "0.0pre20180624";
buildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
propagatedBuildInputs = [ libgcrypt ];
src = fetchFromGitHub {
owner = "samee";
repo = "obliv-c";
rev = "9a6be5a5f44d341bc357055e11922f6a4c4c3b65";
sha256 = "0jz2ayadx62zv2b5ji947bkvw63axl4a2q70lwli86zgmcl390gf";
rev = "3d6804ca0fd85868207a0ccbd2509ec064723ac2";
sha256 = "1ib21ngn7zr58xxq4sjigrpaxb0wx35x3k9l4qvwflzrmvnman20";
};

patches = [ ./ignore-complex-float128.patch ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qpdf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }:

let version = "8.1.0";
let version = "8.2.1";
in
stdenv.mkDerivation rec {
name = "qpdf-${version}";

src = fetchurl {
url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
sha256 = "1m3hcgip6bzjx4gd7wq1328p8zi3pq5savzncdyln6l0lcklh7vx";
sha256 = "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl";
};

nativeBuildInputs = [ perl ];
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:

buildLinux (args // rec {
version = "4.14.55-146";
version = "4.14.66-147";

# modDirVersion needs to be x.y.z.
modDirVersion = "4.14.55";
modDirVersion = "4.14.66";

# branchVersion needs to be x.y.
extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "hardkernel";
repo = "linux";
rev = version;
sha256 = "1bm1njng4rwfylgnqv06vabkvybm9rikqj1lsb7p9qcs3y1kw6mh";
sha256 = "06v38jl4i7l8gl8zcpyp9vmjjhaqhbp7by15f82rxa724zppxi9x";
};

defconfig = "odroidxu4_defconfig";
6 changes: 3 additions & 3 deletions pkgs/tools/compression/upx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
name = "upx-${version}";
version = "3.94";
version = "3.95";
src = fetchurl {
url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz";
sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1";
url = "https://github.com/upx/upx/releases/download/v${version}/${name}-src.tar.xz";
sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv";
};

CXXFLAGS = "-Wno-unused-command-line-argument";