diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:02:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 00:02:06 +0000 |
| commit | 08a8809bfe1688df8419f41fd31c2f794c4debdf (patch) | |
| tree | 02c532b4ebeac226362c3723c8b9cfa1ef7e4c5c /pkgs/tools/filesystems | |
| parent | 11332e9137fbbab82b10312da9dad67e3607f553 (diff) | |
| parent | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (diff) | |
| download | nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.gz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.bz2 nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.lz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.xz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.zst nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/fatsort/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/smbnetfs/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/yandex-disk/default.nix | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index ec7563dfc49..7c9edf2f84d 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; - inherit version; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 3bbff2903bc..bb042a95ecc 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; - inherit version; homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index d2779e2b4c5..e837350abd6 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00"; + sha256 = "e4f579963199f05476657f0066beaa32d1261aef2203382f3919e1ed4bc4594e"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; + sha256 = "69113bf33ba0c57a363305b76361f2866c3b8394b173eed0f49db1f50bfe0373"; }; in stdenv.mkDerivation rec { pname = "yandex-disk"; - version = "0.1.5.1039"; + version = "0.1.6.1074"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; |