diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 19:30:14 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-07 19:30:14 +0200 |
| commit | 87a5d8fedeb4949234a84206f3da9f3d882d1111 (patch) | |
| tree | 1ad4a4072d0117e6a6ace03edd3469940b9cacf6 /pkgs/tools/text | |
| parent | 9ab5d019759f7b298461c99013e0b939c6a75b42 (diff) | |
| parent | 3c1a202a165886b2ea61d881f002226bd58427d2 (diff) | |
| download | nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.gz nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.bz2 nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.lz nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.xz nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.tar.zst nixpkgs-87a5d8fedeb4949234a84206f3da9f3d882d1111.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/amber/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/tools/text/gtranslator/default.nix | 4 |
2 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix new file mode 100644 index 00000000000..c8f380739a6 --- /dev/null +++ b/pkgs/tools/text/amber/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "amber"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = pname; + rev = "v${version}"; + sha256 = "0jwrkd6qhxj2mqsfmhk687k15f7gf36gjyxnynj0yh8db2db6mjc"; + }; + + cargoSha256 = "0iv8zvglwaihcc89dk9kkhchbj1g3v8wq8jcbrgcbclcsyymmplc"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A code search-and-replace tool"; + homepage = https://github.com/dalance/amber; + license = with licenses; [ mit ]; + maintainers = [ maintainers.bdesham ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 20f1bc845cd..69924bb234b 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.32.0"; + version = "3.32.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dqigah7x6h3afw5jcs3lw3h9y0acj72arcgxr89l6galvknr2xa"; + sha256 = "1nmlj41wm02lbgrxdlpqpcgdab5cxsvggvqnk43v6kk86q27pcz1"; }; nativeBuildInputs = [ |