From d36bbb292f0e8bd8a8c41b30c714776833a115f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 6 Nov 2024 09:56:51 +0100 Subject: pkgs/sdcv: use the upstream version This uses the same wrapper but uses the base package from the upstream. --- flake.lock | 50 +++++++++++++++++++++++++------------------------- pkgs/default.nix | 2 +- pkgs/sdcv/default.nix | 33 --------------------------------- 3 files changed, 26 insertions(+), 59 deletions(-) delete mode 100644 pkgs/sdcv/default.nix diff --git a/flake.lock b/flake.lock index 2e82b9c..dce1e7c 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730874081, + "narHash": "sha256-VK7LkfdcpUi8tqcgMIYY2jejDh4O3MNw9An0FcKveRQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "12ad8c1bf13ff15ffa6afe82c59b4af0b9226035", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730272153, - "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", + "lastModified": 1730831018, + "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", + "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728409405, - "narHash": "sha256-kk530XBUGDpt0DQbyUb3yDpSddPqF9PA5KTo/nsmmg0=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1366d1af8f58325602280e43ed6233849fb92216", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1726583932, - "narHash": "sha256-zACxiQx8knB3F8+Ze+1BpiYrI+CbhxyWpcSID9kVhkQ=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "658e7223191d2598641d50ee4e898126768fe847", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -367,11 +367,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1728486645, - "narHash": "sha256-UFyySzQKbFsACIcub8FWMb+U8ltAJEVz0O5E4VSOUSI=", + "lastModified": 1730395408, + "narHash": "sha256-CbydVAtg1b98Rgv4B+HaLBxExETqX8Zd5HCJjYsN/5A=", "owner": "silicon-heaven", "repo": "pyshv", - "rev": "984480c1bc5fba64bfc9bbf96f924f5433524030", + "rev": "2c02d6d632407b25a4d61ca4f324626948615a6b", "type": "gitlab" }, "original": { @@ -401,11 +401,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1727859737, - "narHash": "sha256-iLg/qr52z34fsQGzlCBHv3HpNkSWVOxl3/r2mIDS/wQ=", + "lastModified": 1730815332, + "narHash": "sha256-xcCeGs/HSWRhUUy6Z73zDhq+antK2ADh62QMNIX2kLo=", "ref": "refs/heads/master", - "rev": "699d10813cd26bec34a7e128c18d9198150f38e8", - "revCount": 113, + "rev": "b2f1bd289e9bae405f95ba0aa2478da45c07e713", + "revCount": 114, "type": "git", "url": "https://git.cynerd.cz/shellrc" }, @@ -421,11 +421,11 @@ "pyshv": "pyshv" }, "locked": { - "lastModified": 1728913217, - "narHash": "sha256-3eFLDG8UsCm/RUry8vlr8TEA80SOCZIrVptEGSjqTzE=", + "lastModified": 1730402268, + "narHash": "sha256-Um50rlwhiq6qg734r4idVCQ0rFqos0mbEr3qimQOS4A=", "owner": "silicon-heaven", "repo": "shvcli", - "rev": "b94932dda9b2911d85500366075357c6f22cef51", + "rev": "67868104311ea379e6e2d4cc0a132c18a6fabb38", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1730290190, - "narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=", + "lastModified": 1730480204, + "narHash": "sha256-0ruV4QT2IlxCFQylmBvBui44cg6jTxF/qJvbR8xSn6w=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b", + "rev": "b750c250dac3796014c98a473730b3f432ce9f6b", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index b5bbe6b..083e325 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,7 @@ final: prev: { stardict-en-cz = final.callPackage ./stardict/en-cz.nix {}; stardict-de-cz = final.callPackage ./stardict/de-cz.nix {}; stardict-cz = final.callPackage ./stardict/cz.nix {}; - sdcv-unwrapped = final.callPackage ./sdcv {}; + sdcv-unwrapped = prev.sdcv; sdcv = final.callPackage ./stardict/wrapper.nix {stardict = final.sdcv-unwrapped;}; lorem-text = final.callPackage ./lorem-text {}; diff --git a/pkgs/sdcv/default.nix b/pkgs/sdcv/default.nix deleted file mode 100644 index 8817270..0000000 --- a/pkgs/sdcv/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - gettext, - zlib, - glib, - pcre, - readline, -}: -stdenv.mkDerivation (attrs: { - pname = "sdcv"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "Dushistov"; - repo = attrs.pname; - rev = "v${attrs.version}"; - hash = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4="; - }; - - nativeBuildInputs = [cmake pkg-config gettext]; - buildInputs = [zlib glib pcre readline]; - makeFlags = "sdcv lang"; - - meta = with lib; { - description = "Console version of Stardict program"; - homepage = "https://dushistov.github.io/sdcv/"; - license = licenses.gpl2; - }; -}) -- cgit v1.2.3