diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-21 08:43:10 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-21 08:43:10 +0100 |
commit | 1ffd7cf0d6cb509565deb21a6e57a17575834b76 (patch) | |
tree | 60b348740eec1eac0730c50016372762141836d9 /pkgs/tools/misc | |
parent | 553b7a8bf08cfdcf5bd64c5118f4a4fec640f93b (diff) | |
parent | 65c4e2500f25076a2db330b8953410faab817420 (diff) | |
download | nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.gz nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.bz2 nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.lz nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.xz nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.tar.zst nixpkgs-1ffd7cf0d6cb509565deb21a6e57a17575834b76.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/cutecom/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/execline/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/flameshot/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/s6-portable-utils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/topgrade/default.nix | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index d825b555e19..e109b12f287 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cutecom"; - version = "0.51.0"; + version = "0.51.0+patch"; src = fetchFromGitLab { owner = "cutecom"; repo = "cutecom"; - rev = "v${version}"; - sha256 = "1zprabjs4z26hsb64fc3k790aiiqiz9d88j666xrzi4983m1bfv8"; + rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca"; + sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE="; }; preConfigure = '' diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index ecedd2b0b41..dfc2b1756fe 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -7,8 +7,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.6.1.0"; - sha256 = "0mj565xml3hvw27finydms0s9abbbpgbr29vnr8gwi7zjzq7ck52"; + version = "2.6.1.1"; + sha256 = "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 3dcf1e96269..988849fbbbf 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { meta = with lib; { description = "Powerful yet simple to use screenshot software"; - homepage = "https://flameshot.js.org"; + homepage = "https://github.com/flameshot-org/flameshot"; maintainers = [ maintainers.scode ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index bc32489c588..fee6ae14bbd 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,8 +7,8 @@ let in buildPackage { pname = pname; - version = "2.2.2.2"; - sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3"; + version = "2.2.3.0"; + sha256 = "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 715bbc879cd..62816b22796 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "5.9.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "17vrnwx8qv2s2m9sj7h4gxxrnppqs9yzjzp8jsyfnpqd66h60wcg"; + sha256 = "15ad30svvr775dxp5gwlq73xydsqwfpw650c3c3ma4jshw36w0x4"; }; - cargoSha256 = "1k5lslin5qpmgz1zkz6xazjnapbr0i5r2ifzcz7bdbxwkaaliksd"; + cargoSha256 = "0bwy2y44czhvckipvjn28j6ds1pnbj38i29hvlv4f782imfn92hz"; buildInputs = lib.optional stdenv.isDarwin Foundation; |