Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d85b0f554b3a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e0a1c8f003e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 15, 2019

  1. shadowsocks-libev: 3.2.5 -> 3.3.0

    @marsam
    marsam committed Jun 15, 2019
    Copy the full SHA
    f87183a View commit details

Commits on Jun 20, 2019

  1. Merge pull request #63185 from marsam/update-shadwsocks 

    shadowsocks-libev: 3.2.5 -> 3.3.0
    @marsam
    marsam authored Jun 20, 2019
    Copy the full SHA
    e0a1c8f View commit details
Showing with 2 additions and 8 deletions.
  1. +2 −8 pkgs/tools/networking/shadowsocks-libev/default.nix
10 changes: 2 additions & 8 deletions pkgs/tools/networking/shadowsocks-libev/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@

stdenv.mkDerivation rec {
pname = "shadowsocks-libev";
version = "3.2.5";
version = "3.3.0";

# Git tag includes CMake build files which are much more convenient.
src = fetchFromGitHub {
owner = "shadowsocks";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "09z20y35zjzsx5fd5cnnxxgbfcrh2bp0z7m15l59wlmlsfp7r2pw";
sha256 = "0f6fk7p49b1m78v4ipacbl522nma9b3qzrvihzp2mmsa6j3cysgr";
fetchSubmodules = true;
};

@@ -22,12 +22,6 @@ stdenv.mkDerivation rec {

cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ];

postInstall = ''
cp lib/* $out/lib
chmod +x $out/bin/*
mv $out/pkgconfig $out/lib
'';

meta = with stdenv.lib; {
description = "A lightweight secured SOCKS5 proxy";
longDescription = ''