Merge branch 'master' into staging-next

(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:55 +02:00
201 changed files with 2565 additions and 1560 deletions
+2 -2
View File
@@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "birdfont";
version = "2.29.1";
version = "2.29.4";
src = fetchurl {
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi";
sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8=";
};
nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ];
+2 -2
View File
@@ -15,13 +15,13 @@ let binPath = lib.makeBinPath [
];
in stdenv.mkDerivation rec {
pname = "debootstrap";
version = "1.0.123";
version = "1.0.124";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz";
sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy";
sha256 = "sha256-dwDphksp8WaybFQVPtjCdbRvS5pgRou2B+AZpkwWzY8=";
};
nativeBuildInputs = [ makeWrapper ];
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "gh-ost";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "github";
repo = "gh-ost";
rev = "v${version}";
sha256 = "0laj5nmf10qn01mqn0flipmhankgvrcfbdl3bc76wa14qkkg722m";
sha256 = "sha256-srJXzY4TTHZDYKq8OPqin4zRoYlmaJKhHXDzO/GjBV8=";
};
goPackagePath = "github.com/github/gh-ost";
+2 -2
View File
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, perl, ncurses }:
stdenv.mkDerivation rec {
version = "20190601.d1519e0";
version = "20210215.5a9cb02";
pname = "ipbt";
src = fetchurl {
url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz";
sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5";
sha256 = "0w6blpv22jjivzr58y440zv6djvi5iccdmj4y2md52fbpjngmsha";
};
nativeBuildInputs = [ perl ];