diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
| commit | 7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566 (patch) | |
| tree | f10b8dd05c774ed6cf9afba85426abbf4527f2a0 /pkgs/applications | |
| parent | f08e3e38d4bf983480fcde77911136bab70d8e80 (diff) | |
| parent | 7e8454fb856573967a70f61116e15f879f2e3f6a (diff) | |
| download | nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.gz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.bz2 nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.lz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.xz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.zst nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/yoshimi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/radio/chirp/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/bcftools/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 24620d91ff5..0cd512e5093 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { pname = "yoshimi"; - version = "1.6.0.3"; + version = "1.6.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; - sha256 = "1z2mnmm299ng6jcwa61dzr1ilwa5fjgsggxl2wa5smji6b4npmx7"; + sha256 = "044k2pcdsb43znc8q63mc4niggpain7wl9s5c4sgsfmrjh0bjapj"; }; buildInputs = [ diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 0c31a2006c7..dcbf3522e39 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,15 +4,15 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20191123"; + version = "20191221"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "11wzk0c9fa3gp185gyd47g3sh7gfallw7qapr6qp913q2zfmif8v"; + sha256 = "1f4h45cbaq3rssl95xax8gn2bm1slnsbgds479db46czgq6y1qhy"; }; propagatedBuildInputs = with python2.pkgs; [ - pygtk pyserial libxml2 + pygtk pyserial libxml2 future ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 33e4de0d95a..4a6a464de46 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.9"; + version = "1.10.2"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg"; + sha256 = "0b2f6lqhxdlrvfjqxv7a4nzqj68c1j4avn16iqxwwm80kn302wzm"; }; buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; |