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

Commits on Oct 15, 2019

  1. suricata: 4.1.4 -> 4.1.5 (#70801) 

    * suricata: 4.1.4 -> 4.1.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/suricata/versions

* suricata: fix Hyperscan includes location

+ add lz4 to build inputs for compressed pcap

(cherry picked from commit 6d84700)
    @r-ryantm @c0bw3b
    r-ryantm authored and c0bw3b committed Oct 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a93d0e2 View commit details

  2. sysstat: fix source url 

    (cherry picked from commit 8c3a403)
    @wizeman @c0bw3b
    wizeman authored and c0bw3b committed Oct 15, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    681a947 View commit details
Showing with 6 additions and 4 deletions.
  1. +5 −3 pkgs/applications/networking/ids/suricata/default.nix
  2. +1 −1 pkgs/os-specific/linux/sysstat/default.nix
8 changes: 5 additions & 3 deletions pkgs/applications/networking/ids/suricata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
, libpcap
, libyaml
, luajit
, lz4
, nspr
, nss
, pcre
@@ -29,11 +30,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
version = "4.1.4";
version = "4.1.5";

src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
sha256 = "02901wjf90171rhkymcgp0h48hkn3wv8iwrhz4d8ppraz68hv99d";
sha256 = "0jy738rs3ds1gbn8hv26ck23z9k6pjrjxdpavkyn7znpbi9zdrff";
};

nativeBuildInputs = [
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
libpcap
libyaml
luajit
lz4
nspr
nss
pcre
@@ -86,7 +88,7 @@ stdenv.mkDerivation rec {
"--with-libnet-libraries=${libnet}/lib"
]
++ lib.optional hyperscanSupport [
"--with-libhs-includes=${hyperscan}/include"
"--with-libhs-includes=${hyperscan.dev}/include/hs"
"--with-libhs-libraries=${hyperscan}/lib"
]
++ lib.optional redisSupport [ "--enable-hiredis" ]
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/sysstat/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "sysstat-12.1.5";

src = fetchurl {
url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz";
sha256 = "1i92jmrqcpzgy98r1f4fd0x7y2wvwc05ywsh19w3s2gmndmr75m4";
};