diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-25 14:57:11 +0200 |
| commit | 985d1ac425735963d396e1c09dd49ad111813649 (patch) | |
| tree | 38a90f65d3bf5906ef020ef2c9482565325e850e /pkgs/tools/nix | |
| parent | bc238b8df55bad9d8a436e120615cc5cfbbb78dc (diff) | |
| parent | f188bad6eaf26ebee19d02df03b1c6ae56c4d7f6 (diff) | |
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.
Hydra nixpkgs: ?compare=1538611
Diffstat (limited to 'pkgs/tools/nix')
| -rw-r--r-- | pkgs/tools/nix/nixpkgs-fmt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index 34715c8673aa..51e4e22bc5b6 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,13 +1,13 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "0sa0263pkpi423f1rdyg90axw9sdmgj8ma1mza0v46qzkwynwgh3"; + sha256 = "0nz4njmrwacizz9z89ligxr2gyggk65vq9cmd6s4hn133gajf2n1"; }; cargoSha256 = "0p3qa1asdvw2npav4281lzndjczrzac6fr8z4y61m7rbn363s8sa"; |