From 018df08ae2e5cac201c9d63161735831602d9484 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 7 Jul 2024 13:43:19 +0300 Subject: [PATCH 1/2] cue2pops: move to by-name; format via nixfmt-rfc-style --- .../default.nix => by-name/cu/cue2pops/package.nix} | 7 ++++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{tools/cd-dvd/cue2pops/default.nix => by-name/cu/cue2pops/package.nix} (95%) diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/by-name/cu/cue2pops/package.nix similarity index 95% rename from pkgs/tools/cd-dvd/cue2pops/default.nix rename to pkgs/by-name/cu/cue2pops/package.nix index 6cb93b3e04be2..6660c6eb954d0 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/by-name/cu/cue2pops/package.nix @@ -1,6 +1,7 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, }: stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5447ab2099378..c4d0f93dabb10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4398,8 +4398,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix); From 139e900b88e9302fcef6f5cddd6377b10382720a Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 7 Jul 2024 13:44:18 +0300 Subject: [PATCH 2/2] cue2pops: modernize derivation --- pkgs/by-name/cu/cue2pops/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/cu/cue2pops/package.nix b/pkgs/by-name/cu/cue2pops/package.nix index 6660c6eb954d0..3756597d900cb 100644 --- a/pkgs/by-name/cu/cue2pops/package.nix +++ b/pkgs/by-name/cu/cue2pops/package.nix @@ -3,16 +3,15 @@ stdenv, fetchFromGitHub, }: - stdenv.mkDerivation { pname = "cue2pops"; - version = "unstable-2018-01-04"; + version = "0-unstable-2018-01-04"; src = fetchFromGitHub { owner = "makefu"; repo = "cue2pops-linux"; rev = "541863adf23fdecde92eba5899f8d58586ca4551"; - sha256 = "05w84726g3k33rz0wwb9v77g7xh4cnhy9sxlpilf775nli9bynrk"; + hash = "sha256-M1u/UqS2nONovLTr5KFlBPbzztlpcQ5+HmOOZ8QhiBc="; }; dontConfigure = true; @@ -20,15 +19,17 @@ stdenv.mkDerivation { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' + runHook preInstall install --directory --mode=755 $out/bin install --mode=755 cue2pops $out/bin + runHook postInstall ''; - meta = with lib; { + meta = { description = "Convert CUE to ISO suitable to POPStarter"; homepage = "https://github.com/makefu/cue2pops-linux"; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; mainProgram = "cue2pops"; }; }