From d2d48931f17dc2fdd3f43001b2875ada5b893b2d Mon Sep 17 00:00:00 2001 From: ckie Date: Tue, 7 Nov 2023 18:32:19 +0200 Subject: [PATCH 1/2] mommy: 1.2.3 -> 1.2.4 --- pkgs/tools/misc/mommy/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/misc/mommy/default.nix b/pkgs/tools/misc/mommy/default.nix index ae04e92c630b..24e83eef6d09 100644 --- a/pkgs/tools/misc/mommy/default.nix +++ b/pkgs/tools/misc/mommy/default.nix @@ -23,28 +23,15 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "FWDekker"; repo = pname; rev = "v${version}"; - hash = "sha256-LT21MJg2rF84o2rWKguEP4UUOOu27nNGls95sBYgICw="; + hash = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4="; }; - patches = [ - # 🫣 mommy finds your config with an environment variable now~ - (fetchpatch { - url = "https://github.com/FWDekker/mommy/commit/d5785521fe2ce9ec832dbfe20abc483545b1df97.patch"; - hash = "sha256-GacUjQyvvwRRYKIHHTTAL0mQSPMZbbxacqilBaw807Y="; - }) - # 💜 mommy follows the XDG base directory specification now~ - (fetchpatch { - url = "https://github.com/FWDekker/mommy/commit/71806bc0ace2822ac32dc8dd5bb0b0881d849982.patch"; - hash = "sha256-Znq3VOgYI7a13Fqyz9nevtrvn7S5Jb2uBc78D0BG8rY="; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = [ shellspec ]; installFlags = [ "prefix=$(out)" ]; From af6823703bf5bde50039ee35f7565082f9bab79e Mon Sep 17 00:00:00 2001 From: ckie Date: Tue, 7 Nov 2023 18:33:23 +0200 Subject: [PATCH 2/2] mommy: migrate to by-name --- .../misc/mommy/default.nix => by-name/mo/mommy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/mommy/default.nix => by-name/mo/mommy/package.nix} (100%) diff --git a/pkgs/tools/misc/mommy/default.nix b/pkgs/by-name/mo/mommy/package.nix similarity index 100% rename from pkgs/tools/misc/mommy/default.nix rename to pkgs/by-name/mo/mommy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af609d1e8a3a..241e1d740091 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19704,8 +19704,6 @@ with pkgs; ''; }; - mommy = callPackage ../tools/misc/mommy { }; - moon = callPackage ../development/tools/build-managers/moon/default.nix { }; msgpack-tools = callPackage ../development/tools/msgpack-tools { };