diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-31 12:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 12:02:10 +0000 |
| commit | 9aa014c46a227ba5d0223851e8b0386f0869aa23 (patch) | |
| tree | fe8c9aa62289b371d9edbfe88273025fc2144607 /pkgs/data/misc | |
| parent | 22c23dbb8de9969e8c9b898a06d2f36b10d0b809 (diff) | |
| parent | ac5a927919638e6a9c69cd35084c7e7801472498 (diff) | |
| download | nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.gz nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.bz2 nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.lz nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.xz nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.tar.zst nixpkgs-9aa014c46a227ba5d0223851e8b0386f0869aa23.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data/misc')
| -rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/data/misc/hackage/pin.json | 8 |
2 files changed, 5 insertions, 6 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/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d22dccf38cf..f3e784b47c6 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "aa8f2230d08c540df249147ea681a5c22314d083", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/aa8f2230d08c540df249147ea681a5c22314d083.tar.gz", - "sha256": "1h92r4si1vmf3v2m843xaqwr99hpnn1s0x08qcvd2gwjkc2qq10a", - "msg": "Update from Hackage at 2022-02-14T17:17:31Z" + "commit": "f504760b580057f368d85ed6f6c4e78a38968ff4", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f504760b580057f368d85ed6f6c4e78a38968ff4.tar.gz", + "sha256": "0m3w7bawx0qxj2qn3yx1d4j90dq89k5c4604f6z38cxxx0rszmzj", + "msg": "Update from Hackage at 2022-03-26T03:24:04Z" } |