diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-01 00:12:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 00:12:42 +0000 |
| commit | e5622af8b65d6f1aecf31f8466b4117afd8882ac (patch) | |
| tree | a6beb9009d2456bd18c575fbb75a7f89cd18901a /pkgs/data/misc | |
| parent | fd269eacc61d9fc052f5c6f398f2f036df74d1a6 (diff) | |
| parent | 5e2ced2025bf426e6c3a31c4cd542f0872a2c6af (diff) | |
| download | nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.tar nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.tar.gz nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.tar.bz2 nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.tar.lz nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.tar.xz nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.tar.zst nixpkgs-e5622af8b65d6f1aecf31f8466b4117afd8882ac.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/data/misc/v2ray-geoip/default.nix | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 9ac49167f66..a1bdef2639a 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -21,10 +21,9 @@ stdenv.mkDerivation rec { ./autogen.sh ''; + nativeBuildInputs = [ autoconf automake ]; buildInputs = [ - autoconf - automake libtool intltool ]; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 1e0d35d5200..49f8fc746d6 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202203240042"; + version = "202203310042"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "d7ff77f883216595a4b6674e9507f305195dcda3"; - sha256 = "sha256-wSm24nXz4QIM8e7Z8d08NjluLaBWEdl09FNAL3GR9so="; + rev = "eb0fc69f57bdceef077e38d4f4f57c114411bd76"; + sha256 = "sha256-CSABX+329/WgaXy144JgYsr3OesI69vCfew5qxz5jMY="; }; installPhase = '' |