Merge branch 'master' into staging-next
This commit is contained in:
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jdupes";
|
||||
version = "1.19.2";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbruchon";
|
||||
repo = "jdupes";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk=";
|
||||
sha256 = "sha256-G6ixqSIdDoM/OVlPfv2bI4MA/k0x3Jic/kFo5XEsN/M=";
|
||||
# Unicode file names lead to different checksums on HFS+ vs. other
|
||||
# filesystems because of unicode normalisation. The testdir
|
||||
# directories have such files and will be removed.
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
|
||||
let
|
||||
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
|
||||
version = "1.4.0";
|
||||
gitRev = "fee4ffac9ee16fc921d413789cc059b043f2db3d";
|
||||
sha256 = "sha256:0ix0k85ywlvkxsampajkq521d290gb0n60qwhnk6j0sc55yn558h";
|
||||
cargoSha256 = "sha256:1ngn4wnyh6cjnyg7mb48zvng0zn5fcn8s75y88nh91xq9x1bi2d9";
|
||||
version = "1.5.0";
|
||||
gitRev = "f4b6a135e2efb18b3a679e3946d4d070a1c45a2c";
|
||||
sha256 = "0irgzw7vwhvm97nmylj44x2dnd8pwf47gvlgw7fj58fj67a0l8fr";
|
||||
cargoSha256 = "18l7yxciqcvagsg9lykilfhr104a4qqdydjkjysxgd197xalxgzr";
|
||||
|
||||
in (rustPlatform.buildRustPackage rec {
|
||||
pname = "lorri";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
sha256 = "sha256-sqEodshg6nm3O4RK63ht8u6FU98bF/1i6frS50oyZY8=";
|
||||
sha256 = "sha256-0dCIHgoyNgpxbrPDv26oLdU+npcIgpCQdpX4HzS0vN0=";
|
||||
};
|
||||
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
|
||||
Reference in New Issue
Block a user