diff options
author | figsoda <figsoda@pm.me> | 2023-05-12 20:53:08 -0400 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2023-05-12 20:55:05 -0400 |
commit | 9806e82632362fb138491687f917df7d9ca863d2 (patch) | |
tree | 639a817be2d2c380402bdcd1fc1559dcb1511862 /pkgs | |
parent | 1e5e280decab945c1e325feb2768d96af603d9ec (diff) |
movine: 0.11.0 -> 0.11.4, unpin openssl
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/database/movine/default.nix | 38 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 20 insertions, 23 deletions
diff --git a/pkgs/development/tools/database/movine/default.nix b/pkgs/development/tools/database/movine/default.nix index fd5debcb9a200..a0342bcfc0a44 100644 --- a/pkgs/development/tools/database/movine/default.nix +++ b/pkgs/development/tools/database/movine/default.nix @@ -1,32 +1,32 @@ -{ rustPlatform -, fetchFromGitHub -, lib -, stdenv +{ lib +, rustPlatform +, fetchCrate , pkg-config -, postgresql -, sqlite , openssl -, Security -, libiconv +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "movine"; - version = "0.11.0"; + version = "0.11.4"; - src = fetchFromGitHub { - owner = "byronwasti"; - repo = pname; - rev = "v${version}"; - sha256 = "0rms8np8zd23xzrd5avhp2q1ndhdc8f49lfwpff9h0slw4rnzfnj"; + src = fetchCrate { + inherit pname version; + hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8="; }; - cargoSha256 = "sha256-4ghfenwmauR4Ft9n7dvBflwIMXPdFq1vh6FpIegHnZk="; + cargoHash = "sha256-brM6QObhl9W5SZ+79Kv9oNxnglO24BUgjPSQy9jV1/Q="; + + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql sqlite ] ++ ( - if !stdenv.isDarwin then [ openssl ] else [ Security libiconv ] - ); + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "A migration manager written in Rust, that attempts to be smart yet minimal"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56043e998bfee..6c7dd03eb6545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22833,10 +22833,7 @@ with pkgs; mono-addins = callPackage ../development/libraries/mono-addins { }; - movine = callPackage ../development/tools/database/movine { - inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; - }; + movine = callPackage ../development/tools/database/movine { }; movit = callPackage ../development/libraries/movit { }; |