ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 03:59:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #210458 from NickCao/openssl3

Browse Source 
various: unpin openssl_1_1
This commit is contained in:
superherointj 2023-02-03 19:27:21 -03:00 committed by GitHub
commit 95642fb287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 59 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pkgs/applications/misc/imag/default.nix
View File

@ -1,61 +0,0 @@
{ 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;
};
}

8
pkgs/applications/science/machine-learning/finalfrontier/default.nix
View File

@ -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

26
pkgs/applications/version-management/git-subset/default.nix
View File

@ -1,26 +0,0 @@
{ 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 ];
};
}

31
pkgs/development/tools/rust/devserver/default.nix
View File

@ -1,31 +0,0 @@
{ 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 ];
};
}

56
pkgs/os-specific/linux/firmware/firmware-manager/default.nix
View File

@ -1,32 +1,56 @@
{ 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)'";
nativeBuildInputs = with rustPlatform; [
rust.cargo
rust.rustc
pkg-config
cargoSetupHook
wrapGAppsHook
];
installPhase = "make prefix='$(out)' install";
buildInputs = [
openssl
gtk3
udev
];
cargoSha256 = "sha256-BUo77ERHvuc8IkDdU3Z/gZZicNHT26IbAgEBnVM3O4U=";
doCheck = false;
makeFlags = [ "prefix=$(out)" ];
meta = {
description = "Graphical frontend for firmware management";

11
pkgs/tools/misc/coinlive/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "coinlive";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "mayeranalytics";
repo = pname;
rev = "v${version}";
hash = "sha256-i21C1ZSAPoUOBlnDQl40/17yRqmNx3wkjswHJeV9vko=";
hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
};
cargoSha256 = "sha256-0pUXCY5rZWh26KGD2OU2+M9L0RtCIan6hmuNeIeBEHI=";
cargoSha256 = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";
nativeBuildInputs = [
pkg-config
@ -30,6 +30,11 @@ rustPlatform.buildRustPackage rec {
Security
];
checkFlags = [
# requires network access
"--skip=utils::test_get_infos"
];
meta = with lib; {
description = "Live cryptocurrency prices CLI";
homepage = "https://github.com/mayeranalytics/coinlive";

8
pkgs/tools/networking/tunnelto/default.nix
View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "tunnelto";
version = "0.1.18";
version = "unstable-2022-09-25";
src = fetchFromGitHub {
owner = "agrinman";
repo = pname;
rev = version;
sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs=";
rev = "06428f13c638180dd349a4c42a17b569ab51a25f";
sha256 = "sha256-84jGcR/E1QoqIlbGu67muYUtZU66ZJtj4tdZvmYbII4=";
};
cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk=";
cargoSha256 = "sha256-bVHvQRtnKwrwS0huax6OrteYfxws2Ce2fFaBQ3oeoow=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = [ ]

3
pkgs/top-level/aliases.nix
View File

@ -363,6 +363,7 @@ mapAliases ({
demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22
devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22
devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13
dfu-util-axoloti = throw "dfu-util-axoloti has been removed: abandoned by upstream"; # Added 2022-05-13
dhall-text = throw "'dhall-text' has been deprecated in favor of the 'dhall text' command from 'dhall'"; # Added 2022-03-26
digikam5 = throw "'digikam5' has been renamed to/replaced by 'digikam'"; # Converted to throw 2022-02-22
@ -512,6 +513,7 @@ mapAliases ({
giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01
git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13
gitAndTools = self // {
darcsToGit = darcs-to-git;
@ -655,6 +657,7 @@ mapAliases ({
idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22
ike = throw "ike has been removed, because it was unmaintained"; # Added 2022-05-26
imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15
imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13
imagemagick7Big = imagemagickBig; # Added 2021-02-22
imagemagick7 = imagemagick; # Added 2021-02-22
imagemagick7_light = imagemagick_light; # Added 2021-02-22

18
pkgs/top-level/all-packages.nix
View File

@ -1883,11 +1883,6 @@ with pkgs;
git-subrepo = callPackage ../applications/version-management/git-subrepo { };
git-subset = callPackage ../applications/version-management/git-subset {
openssl = openssl_1_1;
inherit (darwin.apple_sdk.frameworks) Security;
};
git-subtrac = callPackage ../applications/version-management/git-subtrac { };
git-sync = callPackage ../applications/version-management/git-sync { };
@ -12732,7 +12727,6 @@ with pkgs;
tunnelto = callPackage ../tools/networking/tunnelto {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
tuptime = callPackage ../tools/system/tuptime { };
@ -15838,11 +15832,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
devserver = callPackage ../development/tools/rust/devserver {
inherit (darwin.apple_sdk.frameworks) CoreServices;
openssl = openssl_1_1;
};
devspace = callPackage ../development/tools/misc/devspace { };
maturin = callPackage ../development/tools/rust/maturin {
@ -19232,7 +19221,6 @@ with pkgs;
coinlive = callPackage ../tools/misc/coinlive {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
cointop = callPackage ../applications/misc/cointop { };
@ -29173,7 +29161,6 @@ with pkgs;
finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
finalfusion-utils = callPackage ../applications/science/machine-learning/finalfusion-utils {
@ -30308,11 +30295,6 @@ with pkgs;
avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { };
imag = callPackage ../applications/misc/imag {
inherit (darwin.apple_sdk.frameworks) Security;
openssl = openssl_1_1;
};
image-roll = callPackage ../applications/graphics/image-roll { };
imagej = callPackage ../applications/graphics/imagej { };