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

Commits on Jan 11, 2021

  1. _3proxy: 0.8.13 -> 0.9.3

    freezeboy committed Jan 11, 2021
    Copy the full SHA
    02e8041 View commit details

Commits on Jan 12, 2021

  1. Merge pull request #107841 from freezeboy/update-3proxy

    _3proxy: 0.8.13 -> 0.9.3
    SuperSandro2000 authored Jan 12, 2021
    Copy the full SHA
    b53bee8 View commit details
Showing with 9 additions and 8 deletions.
  1. +9 −8 pkgs/applications/networking/3proxy/default.nix
17 changes: 9 additions & 8 deletions pkgs/applications/networking/3proxy/default.nix
Original file line number Diff line number Diff line change
@@ -2,25 +2,26 @@

stdenv.mkDerivation rec {
pname = "3proxy";
version = "0.8.13";
version = "0.9.3";

src = fetchFromGitHub {
owner = "z3APA3A";
repo = pname;
rev = version;
sha256 = "1k5rqldiyakhwhplazlhswkgy3psdkpxhn85605ncwaqx49qy8vk";
sha256 = "9aopwyz0U2bYTvx5YWLJo9EE8Xfb51IOguHRJodjpm8=";
};

makeFlags = [
"-f Makefile.Linux"
"INSTALL=${coreutils}/bin/install"
"prefix=$(out)"
"DESTDIR=${placeholder "out"}"
];
preConfigure = ''
ln -s Makefile.Linux Makefile
'';

meta = with lib; {
description = "Tiny free proxy server";
homepage = "https://github.com/z3APA3A/3proxy";
license = licenses.gpl2;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.misuzu ];
maintainers = with maintainers; [ misuzu ];
};
}