diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/richgo/default.nix | 21 | ||||
-rwxr-xr-x | pkgs/misc/vim-plugins/update.py | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/tmsu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 33 insertions, 8 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d66a778c1cd9..1ad236f0d13f 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.30.0"; + version = "3.31.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz"; + sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw"; }; patches = [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 5c66c5a5298b..4260c3608522 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.9"; + stableVersion = "2.1.10"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7"; - serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx"; + guiSrcHash = "0vn33dcd3sfj5gna79vwm35l8aznga91a8r7i6q06dr4c2svml15"; + serverSrcHash = "062dai1rb04dyrlrjgk0gr5hx0la8n1nalx0il1i7k1inwy52gj5"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix new file mode 100644 index 000000000000..aa537df15084 --- /dev/null +++ b/pkgs/development/tools/richgo/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "richgo-${version}"; + version = "0.2.8"; + goPackagePath = "github.com/kyoh86/richgo"; + + src = fetchFromGitHub { + owner = "kyoh86"; + repo = "richgo"; + rev = "v${version}"; + sha256 = "0kbwl3a2gima23zmahk0jxp7wga91bs927a1rp5xl889ikng1n4j"; + }; + + meta = with stdenv.lib; { + description = "Enrich `go test` outputs with text decorations."; + homepage = https://github.com/kyoh86/richgo; + license = licenses.unlicense; # NOTE: The project switched to MIT in https://git.io/fA1ik + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 8128c12bce68..c9ccd2364725 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -193,12 +193,14 @@ def check_results( print(f"{len(results) - len(failures)} plugins were checked", end="") if len(failures) == 0: print() + return plugins else: print(f", {len(failures)} plugin(s) could not be downloaded:\n") for (plugin, exception) in failures: print_download_error(plugin, exception) - return plugins + + sys.exit(1) def load_plugin_spec() -> List[Tuple[str, str]]: diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 359653465059..3c6dd2648ef6 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.7.0"; + version = "0.7.1"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "0vccxb8mlr7wf92xawnqpvzwlw2xs3b962hjn09dnd6yxqscql64"; + sha256 = "0d1sryq80chb9vrf9z0lfx4xb3sdkg01f9hqf3bb9c89vm6v2lwg"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9722e945594e..493f0d8ae6e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4917,6 +4917,8 @@ with pkgs; redsocks = callPackage ../tools/networking/redsocks { }; + richgo = callPackage ../development/tools/richgo { }; + rst2html5 = callPackage ../tools/text/rst2html5 { }; rt = callPackage ../servers/rt { }; |