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: 88e91e4882d1
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: 52e9f62f5212
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on May 5, 2020

  1. libeatmydata: fix launcher script - find shell library properly 

    The new version of the launcher script in version 105 doesn't have the #8665
bug, but it does try to find the shell library using Debian tools, which
obviously doesn't work on Nix. Removed the now-unneccessary makeWrapper and
patched out the Debian bits.

(cherry picked from commit 4e9b948)
    @enolan @nh2
    enolan authored and nh2 committed May 5, 2020

    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
    77207c1 View commit details

Commits on May 6, 2020

  1. apt-cacher-ng: 3.2 → 3.5 

    Fixes: CVE-2017-7443, CVE-2020-5202
(cherry picked from commit 1c7ad58)
    @mweinelt
    mweinelt committed May 6, 2020
    Copy the full SHA
    3729fae View commit details

Commits on May 7, 2020

  1. Merge pull request #86944 from nh2/libeatmydata-launcher-backport-iss… 

    …ue-80784-20.03

[20.03] libeatmydata: fix launcher script - find shell library properly
    @nh2
    nh2 authored May 7, 2020
    Copy the full SHA
    13a1097 View commit details

  2. Merge pull request #87122 from mweinelt/20.03/pr/apt-cacher-ng 

    [20.03] apt-cacher-ng: 3.2 → 3.5
    @ryantm
    ryantm authored May 7, 2020
    Copy the full SHA
    52e9f62 View commit details
11 changes: 5 additions & 6 deletions pkgs/development/libraries/libeatmydata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,17 +2,16 @@

stdenv.mkDerivation rec {
name = "libeatmydata-105";

src = fetchurl {
url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz";
sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx";
};

buildInputs = [ makeWrapper ];

postInstall = ''
wrapProgram $out/bin/eatmydata \
--prefix PATH : $out/bin
patches = [ ./find-shell-lib.patch ];
patchFlags = "-p0";
postPatch = ''
substituteInPlace eatmydata.in --replace NIX_OUT_DIR $out
'';

meta = {
20 changes: 20 additions & 0 deletions pkgs/development/libraries/libeatmydata/find-shell-lib.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- eatmydata.in 2020-02-01 18:10:59.618679823 -0800
+++ eatmydata.in.new 2020-02-01 18:08:25.092620247 -0800
@@ -15,15 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
-
-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
-if [ -f "$shlib" ]; then
- . "$shlib"
-else
- echo "Unable to locate eatmydata shell library, it was not enabled" >&2
- exec "$@"
-fi
+shlib="NIX_OUT_DIR/libexec/eatmydata.sh"
+. "$shlib"

usage()
{
7 changes: 4 additions & 3 deletions pkgs/servers/http/apt-cacher-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, doxygen
, fetchurl
, fuse
, libevent
, lzma
, openssl
, pkgconfig
@@ -14,15 +15,15 @@

stdenv.mkDerivation rec {
pname = "apt-cacher-ng";
version = "3.2";
version = "3.5";

src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0";
sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2";
};

nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ];
buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ];

meta = with stdenv.lib; {
description = "A caching proxy specialized for linux distribution files";