Unverified Commit 95642fb2 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #210458 from NickCao/openssl3

various: unpin openssl_1_1
parents 8d6a85aa 71034ab5
Loading
Loading
Loading
Loading
+0 −61
Original line number Diff line number Diff line
{ lib, stdenv
, rustPlatform
, fetchFromGitHub
, llvmPackages
, openssl
, pkg-config
, installShellFiles
, Security
, gitMinimal
, util-linuxMinimal
}:

rustPlatform.buildRustPackage rec {
  pname = "imag";
  version = "0.10.1";

  src = fetchFromGitHub {
    owner = "matthiasbeyer";
    repo = pname;
    rev = "v${version}";
    sha256 = "0f9915f083z5qqcxyavj0w6m973c8m1x7kfb89pah5agryy5mkaq";
  };

  nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ];
  buildInputs = [ openssl ]
    ++ lib.optional stdenv.isDarwin Security;
  nativeCheckInputs = [ gitMinimal util-linuxMinimal ];

  cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6";

  checkPhase = ''
    export HOME=$TMPDIR
    git config --global user.email "nobody@example.com"
    git config --global user.name "Nobody"

    # UI tests uses executables directly, so we need to build them before
    # launching the tests
    cargo build
  '' + (
    # CLI uses the presence of a controlling TTY to check if arguments are
    # passed in stdin, or in the command-line, so we use script to create
    # a PTY for us.
    if !stdenv.isDarwin then ''
      script -qfec "cargo test --workspace"
    '' else ''
      script -q "cargo test --workspace"
    ''
  );

  postInstall = ''
    installShellCompletion target/imag.{bash,fish} --zsh target/_imag
  '';

  meta = with lib; {
    description = "Commandline personal information management suite";
    homepage = "https://imag-pim.org/";
    license = licenses.lgpl21;
    maintainers = with maintainers; [ Br1ght0ne minijackson ];
    platforms = platforms.unix;
  };
}
+4 −4
Original line number Diff line number Diff line
@@ -11,16 +11,16 @@

rustPlatform.buildRustPackage rec {
  pname = "finalfrontier";
  version = "0.9.4";
  version = "unstable-2022-01-06";

  src = fetchFromGitHub {
    owner = "finalfusion";
    repo = pname;
    rev = version;
    sha256 = "1lvwv238p8hrl4sc5pmnvaargl2dd25p44gxl3kibq5ng03afd0n";
    rev = "2461fb1dde13b73039926aa66606e470907a1b59";
    sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4=";
  };

  cargoSha256 = "0lhcazcih48gc23q484h344bzz7p3lh189ljhswdyph2i11caarp";
  cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";

  nativeBuildInputs = [
    installShellFiles
+0 −26
Original line number Diff line number Diff line
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }:

rustPlatform.buildRustPackage rec {
  pname = "git-subset";
  version = "0.1.1";

  src = fetchFromGitHub {
    owner = "jasonwhite";
    repo = pname;
    rev = "v${version}";
    sha256 = "02z2r0kcd0nnn1zjslp6xxam5ddbhrmzn67qzxhlamsw0p9vvkbb";
  };

  cargoSha256 = "0lc9m9prmhr4ipjh95cfczvlmpp9scryksvqd49h4acyr904n7ry";

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ];

  meta = with lib; {
    description = "Super fast Git tree filtering";
    homepage = "https://github.com/jasonwhite/git-subset";
    license = licenses.mit;
    maintainers = [ maintainers.marsam ];
  };
}
+0 −31
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchCrate
, rustPlatform
, openssl
, pkg-config
, CoreServices
}:

rustPlatform.buildRustPackage rec {
  pname = "devserver";
  version = "0.4.0";

  src = fetchCrate {
    inherit pname version;
    sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4=";
  };

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin CoreServices;

  cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js=";

  meta = with lib; {
    description = "An extremely tiny tool to serve a static folder locally";
    homepage = "https://github.com/kettle11/devserver";
    license = licenses.zlib;
    maintainers = with maintainers; [ nickhu ];
  };
}
+42 −18
Original line number Diff line number Diff line
{ rustPlatform, lib, fetchFromGitHub, xz, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
rustPlatform.buildRustPackage rec {
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, xz
, pkg-config
, openssl
, dbus
, glib
, udev
, cairo
, pango
, atk
, gdk-pixbuf
, gtk3
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
  pname = "firmware-manager";
  version = "0.1.2";
  version = "unstable-2022-12-09";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = pname;
    rev = version;
    sha256 = "sha256-aKatdjHa/k7j48upkR1O6PFxCUfJYE3KhhzZ9Ohe0Jc=";
    rev = "9be8160346689bd74f95db7897884a91fa48afe3";
    sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M=";
  };

  nativeBuildInputs = [ pkg-config wrapGAppsHook ];

  buildInputs = [ xz openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];

  depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen";
  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    sha256 = "sha256-3drsOmlmy1xXRWg7WMDNN+iuVmPYf60sDLIdCvu4rEw=";
  };

  postPatch = ''
    sed -i 's|etc|$(prefix)/etc|' Makefile
    substituteInPlace Makefile --replace '$(DESTDIR)/etc' '$(DESTDIR)$(prefix)/etc'
  '';

  buildPhase = "make prefix='$(out)'";

  installPhase = "make prefix='$(out)' install";

  cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U=";

  doCheck = false;
  nativeBuildInputs = with rustPlatform; [
    rust.cargo
    rust.rustc
    pkg-config
    cargoSetupHook
    wrapGAppsHook
  ];

  buildInputs = [
    openssl
    gtk3
    udev
  ];

  makeFlags = [ "prefix=$(out)" ];

  meta = {
    description = "Graphical frontend for firmware management";
Loading