diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
| commit | fb2311d4307f9873ccd38c7f080fbf1df8f17daa (patch) | |
| tree | 4df43f65ad5ba49f281d340c3012d63f5d37e8e9 /pkgs/misc | |
| parent | c2884c4011a9496b67ae2ccd8af126854628014b (diff) | |
| parent | 279110cd86e9c969f8f2942675f7c73cfe4059d3 (diff) | |
| download | nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.gz nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.bz2 nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.lz nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.xz nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.zst nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/drivers/utsushi/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/misc/seafile-shared/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 20701c5cc4d..748930da546 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -12,13 +12,13 @@ let ''; in stdenv.mkDerivation rec { pname = "utsushi"; - version = "unstable-2020-11-10"; + version = "unstable-2021-01-01"; src = fetchFromGitLab { owner = pname; repo = pname; - rev = "04700043e2d16062eb8bd27f4efff3024f387d32"; - sha256 = "0rxv5n0985d414i6hwichsn7hybwgwsimpy5s4hmcsvxqcpks4li"; + rev = "1646d7d301f3d2aeb24930696688853fed5f0d43"; + sha256 = "1g9m00qljhlw56h3hgfq67ywf4r92nl37m7x5mxa7ygaxc0dyb14"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 8db6995b6fa..385f2f3cc13 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, ccnet, libuuid }: +{stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, vala, python2, curl, libevent, glib, libsearpc, sqlite, intltool, fuse, libuuid }: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.9"; + version = "7.0.10"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "1n0jq6d6vgk58qmqgdr7w7jfgcrlicnaafz1za9qf76sbi5vc6fk"; + sha256 = "0b3297cbagi9x8dnw2gjifmb8dk6vyhg6vfrfsanm1wyx8pgw2jg"; }; nativeBuildInputs = [ |