summary refs log tree commit diff
diff options
context:
space:
mode:
authorLéo Gaspard <leo@gaspard.io>2020-04-20 00:59:46 +0200
committerGitHub <noreply@github.com>2020-04-20 00:59:46 +0200
commit2d6f7344d849e34a1650e85db6522c179e033a5b (patch)
tree5b8a9504b8098a881485efb10275d0fd0381d184
parentec2710b0d750069f594b89f47006c21c6e074dca (diff)
parent0cf301d95f38c74cab403c424c6b318e3d5dfe79 (diff)
downloadnixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.tar
nixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.tar.gz
nixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.tar.bz2
nixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.tar.lz
nixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.tar.xz
nixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.tar.zst
nixpkgs-2d6f7344d849e34a1650e85db6522c179e033a5b.zip
Merge pull request #74841 from tilpner/ferm-update
ferm: 2.4.1 -> 2.5
-rw-r--r--pkgs/tools/networking/ferm/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix
index dcd3fc6ae99..8fcdeb234ec 100644
--- a/pkgs/tools/networking/ferm/default.nix
+++ b/pkgs/tools/networking/ferm/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }:
 
-stdenv.mkDerivation rec {
-  version = "2.4.1";
+let
+  inherit (stdenv.lib.versions) majorMinor;
+in stdenv.mkDerivation rec {
+  version = "2.5";
   pname = "ferm";
 
   src = fetchurl {
-    url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz";
-    sha256 = "1fv8wk513yysp4q0i65rl2m0hg2lxwwgk9ppprsca1xcxrdpsvwa";
+    url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz";
+    sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p";
   };
 
   buildInputs = [ perl ipset ebtables iptables makeWrapper ];