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: 18cadc6384b0
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: 9e733df81fae
Choose a head ref
  • 6 commits
  • 7 files changed
  • 4 contributors

Commits on Nov 10, 2019

  1. Copy the full SHA
    f40b847 View commit details
  2. libisds: init at 0.11

    mmahut committed Nov 10, 2019
    Copy the full SHA
    9b48dc3 View commit details
  3. datovka: init at 4.14.0

    mmahut committed Nov 10, 2019
    Copy the full SHA
    46d309a View commit details
  4. Merge pull request #73154 from mmahut/datovka

    datovka: init at 4.14.0
    mmahut authored Nov 10, 2019
    Copy the full SHA
    0c4f683 View commit details
  5. Copy the full SHA
    bd20836 View commit details
  6. bettercap: 2.24 -> 2.26.1

    judaew authored and ehmry committed Nov 10, 2019
    Copy the full SHA
    9e733df View commit details
32 changes: 32 additions & 0 deletions pkgs/applications/networking/datovka/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ stdenv
, mkDerivation
, fetchurl
, libxml2
, libisds
, qmake
, qtbase
, qtsvg
, pkg-config
}:

mkDerivation rec {
pname = "datovka";
version = "4.14.0";

src = fetchurl {
url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
sha256 = "0q7zlq522wdgwxgd3jxmxvr3awclcy0mbw3qaymwzn2b8d35168r";
};

buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

nativeBuildInputs = [ pkg-config ];

meta = with stdenv.lib; {
description = "Client application for operating Czech government-provided Databox infomation system";
homepage = "https://www.datovka.cz/";
license = licenses.lgpl3;
maintainers = [ maintainers.mmahut ];
platforms = platforms.linux;
};
}
34 changes: 34 additions & 0 deletions pkgs/development/libraries/libisds/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ stdenv
, fetchurl
, expat
, gpgme
, libgcrypt
, libxml2
, libxslt
, curl
, docbook_xsl
}:

stdenv.mkDerivation rec {
pname = "libisds";
version = "0.11";

src = fetchurl {
url = "http://xpisar.wz.cz/${pname}/dist/${pname}-${version}.tar.xz";
sha256 = "1cy161l7rl25xji2xpb9vjpvg02bc7mwd4fpp2sx9zhpifn5dfbr";
};

configureFlags = [
"--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"
];

buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ];

meta = with stdenv.lib; {
description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
homepage = "http://xpisar.wz.cz/libisds/";
license = licenses.lgpl3;
maintainers = [ maintainers.mmahut ];
platforms = platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/webkitgtk/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.26.1";
version = "2.26.2";

meta = {
description = "Web content rendering engine, GTK port";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb";
sha256 = "04k5h0sid9azsqz9pyq436v1rx4lnfrhvmcgmicqb0c0g9iz103b";
};

patches = optionals stdenv.isLinux [
17 changes: 10 additions & 7 deletions pkgs/development/tools/misc/fsatrace/default.nix
Original file line number Diff line number Diff line change
@@ -2,23 +2,26 @@

stdenv.mkDerivation rec {
pname = "fsatrace";
version = "0.0.1-160";
version = "0.0.1-324";

src = fetchFromGitHub {
owner = "jacereda";
repo = "fsatrace";
rev = "2bf89d836e0156e68f121b0ffeedade7c9381f77";
sha256 = "0bndfmm0y738azwzf6m6xg6gjnrwcqlfjsampk67vga40yylwkbw";
rev = "41fbba17da580f81ababb32ec7e6e5fd49f11473";
sha256 = "1ihm2v723idd6m0kc1z9v73hmfvh2v0vjs8wvx5w54jaxh3lmj1y";
};

preConfigure = ''
mkdir -p $out/libexec/${pname}-${version}
export makeFlags=INSTALLDIR=$out/libexec/${pname}-${version}
installDir = "libexec/${pname}-${version}";

makeFlags = [ "INSTALLDIR=$(out)/$(installDir)" ];

preInstall = ''
mkdir -p $out/$installDir
'';

postInstall = ''
mkdir -p $out/bin
ln -s $out/libexec/${pname}-${version}/fsatrace $out/bin/
ln -s $out/$installDir/fsatrace $out/bin/fsatrace
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/tools/security/bettercap/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
pname = "bettercap";
version = "2.24";
version = "2.26.1";

goPackagePath = "github.com/bettercap/bettercap";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1f8bzxbcyf0bpyqj6hz4l8dp5xknnb537xy9y5skcznp03i44h55";
sha256 = "10qsknyzfpzfpm4gp98jwvw6qmkmx23nw88sbnpl2rlr725l560c";
};

nativeBuildInputs = [ pkgconfig ];
Loading