Merge pull request #162397 from r-ryantm/auto-update/libsolv
libsolv: 0.7.20 -> 0.7.21
This commit is contained in:
commit
7cde130853
|
@ -1,14 +1,14 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.7.20";
|
version = "0.7.21";
|
||||||
pname = "libsolv";
|
pname = "libsolv";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "openSUSE";
|
owner = "openSUSE";
|
||||||
repo = "libsolv";
|
repo = "libsolv";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-NVyLa/fPGnO5jAz9rePFXg/z6RZeFCrkJBCG3gGh+YM=";
|
sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
|
|
|
@ -9,11 +9,6 @@ let
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Patch added by the mamba team
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/add_strict_repo_prio_rule.patch";
|
|
||||||
sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r";
|
|
||||||
})
|
|
||||||
# Patch added by the mamba team
|
# Patch added by the mamba team
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch";
|
url = "https://raw.githubusercontent.com/mamba-org/boa-forge/20530f80e2e15012078d058803b6e2c75ed54224/libsolv/conda_variant_priorization.patch";
|
||||||
|
|
Loading…
Reference in a new issue