gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-24 05:07:16 +00:00
committed by GitHub
parent 7fb1a9172f 16abcb815b
commit baa8a3d30c
21 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/emulators/desmume/default.nix
+2
View File
@@ -6,6 +6,7 @@
, agg
, alsa-lib
, desktop-file-utils
, wrapGAppsHook
, gtk3
, intltool
, libGLU
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
wrapGAppsHook
desktop-file-utils
intltool
libtool
pkgs/applications/misc/keepassxc/default.nix
+2 -2
View File
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s=";
};
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [
"-Wno-old-style-cast"
"-Wno-error"
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
];
]);
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
pkgs/applications/networking/browsers/brave/default.nix
+2 -2
View File
@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.48.158";
version = "1.48.171";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-hgV8+Mjth43KItly98lTh3Ur+h9vA9BfJxOqMGl1ndY=";
sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps=";
};
dontConfigure = true;
pkgs/applications/networking/cluster/terraform-providers/providers.json
+14 -14
View File
@@ -9,14 +9,14 @@
"vendorHash": null
},
"acme": {
"hash": "sha256-iAUbGLxeN2Ntsq0mOWEKuvorIy7u+0kffzIqg+wF9gM=",
"hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=",
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
"owner": "vancluever",
"proxyVendor": true,
"repo": "terraform-provider-acme",
"rev": "v2.13.0",
"rev": "v2.13.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-5gh3e5wPCBA87fHPXTT+hnrXIPVW5meKmT4pFP1ryOc="
"vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE="
},
"age": {
"hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
@@ -364,11 +364,11 @@
"vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo="
},
"exoscale": {
"hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=",
"hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=",
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
"owner": "exoscale",
"repo": "terraform-provider-exoscale",
"rev": "v0.45.0",
"rev": "v0.46.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -802,11 +802,11 @@
},
"nutanix": {
"deleteVendor": true,
"hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=",
"hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=",
"homepage": "https://registry.terraform.io/providers/nutanix/nutanix",
"owner": "nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.7.1",
"rev": "v1.8.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
},
@@ -856,13 +856,13 @@
"vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY="
},
"opentelekomcloud": {
"hash": "sha256-/e/cfesAKYiAvhiXm7SYmpM5O8Rm/qHE8XnCS0m4lNQ=",
"hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.33.0",
"rev": "v1.33.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-GFpDNFn14aAqpBesICGS9AuKpxAe/UwRzTeWP4MReTU="
"vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64="
},
"opsgenie": {
"hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
@@ -1099,11 +1099,11 @@
"vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI="
},
"tencentcloud": {
"hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=",
"hash": "sha256-f6GdDTezh1lDNppCLmjx/7jiKsq2yZoR92kYpGAAldQ=",
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
"owner": "tencentcloudstack",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.79.10",
"rev": "v1.79.11",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1117,11 +1117,11 @@
"vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU="
},
"thunder": {
"hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=",
"hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=",
"homepage": "https://registry.terraform.io/providers/a10networks/thunder",
"owner": "a10networks",
"repo": "terraform-provider-thunder",
"rev": "v1.0.0",
"rev": "v1.1.0",
"spdx": "BSD-2-Clause",
"vendorHash": null
},
pkgs/applications/version-management/smartgithg/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "smartgithg";
version = "22.1.3";
version = "22.1.4";
src = fetchurl {
url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz";
sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4=";
sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk=";
};
nativeBuildInputs = [ wrapGAppsHook ];
pkgs/development/compilers/llvm/15/compiler-rt/default.nix
+3
View File
@@ -151,5 +151,8 @@ stdenv.mkDerivation {
implementations of run-time libraries for dynamic testing tools such as
AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer.
'';
# "All of the code in the compiler-rt project is dual licensed under the MIT
# license and the UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
};
}
pkgs/development/compilers/llvm/15/default.nix
+1 -1
View File
@@ -84,7 +84,7 @@ in let
inherit (releaseInfo) release_version version;
llvm_meta = {
license = with lib.licenses; [ ncsa asl20-llvm ];
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
platforms = lib.platforms.all;
};
pkgs/development/compilers/llvm/15/libcxx/default.nix
+3
View File
@@ -103,5 +103,8 @@ stdenv.mkDerivation rec {
libc++ is an implementation of the C++ standard library, targeting C++11,
C++14 and above.
'';
# "All of the code in libc++ is dual licensed under the MIT license and the
# UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
};
}
pkgs/development/compilers/llvm/15/libcxxabi/default.nix
+3
View File
@@ -100,6 +100,9 @@ stdenv.mkDerivation rec {
longDescription = ''
libc++abi is a new implementation of low level support for a standard C++ library.
'';
# "All of the code in libc++abi is dual licensed under the MIT license and
# the UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ];
};
}
pkgs/development/compilers/llvm/15/openmp/default.nix
+3
View File
@@ -67,5 +67,8 @@ stdenv.mkDerivation rec {
"clang -fopenmp" must be linked before it can run and the library that
supports offload to target devices.
'';
# "All of the code is dual licensed under the MIT license and the UIUC
# License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
};
}
pkgs/development/interpreters/kerf/default.nix
+2 -2
View File
@@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
makeFlags = [ "kerf" "kerf_test" ];
# avoid a huge amount of warnings to make failures clearer
env.NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [
env.NIX_CFLAGS_COMPILE = toString (map (x: "-Wno-${x}") [
"void-pointer-to-int-cast"
"format"
"implicit-function-declaration"
"gnu-variable-sized-type-not-at-end"
"unused-result"
] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ];
] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]);
patchPhase = ''
substituteInPlace ./Makefile \
pkgs/development/libraries/liblastfm/default.nix
+1 -4
View File
@@ -23,10 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ fftwSinglePrec libsamplerate qtbase ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
env.NIX_CFLAGS_COMPILE =
lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-std=c++11"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11";
dontWrapQtApps = true;
pkgs/development/ocaml-modules/lablgtk/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ let param =
rev = version;
sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po=";
};
env.NIX_CFLAGS_COMPILE = null;
env = { };
buildInputs = [ camlp-streams ];
} else if check "3.12" then {
version = "2.18.5";
pkgs/development/python-modules/kiwisolver/default.nix
+3 -1
View File
@@ -20,7 +20,9 @@ buildPythonPackage rec {
hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU=";
};
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
"-I${lib.getDev libcxx}/include/c++/v1"
];
nativeBuildInputs = [
setuptools-scm
pkgs/development/python-modules/py3exiv2/default.nix
+1 -3
View File
@@ -26,9 +26,7 @@ buildPythonPackage rec {
];
# Work around Python distutils compiling C++ with $CC (see issue #26709)
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [
"-I${lib.getDev libcxx}/include/c++/v1"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
pythonImportsCheck = [
"pyexiv2"
pkgs/development/python-modules/pydrive2/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pydrive2";
version = "1.15.0";
version = "1.15.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyDrive2";
inherit version;
hash = "sha256-OuBrZr+WP0NSSYnIf01ngDlEH+BZmTxnA/szzDxtiuw=";
hash = "sha256-Hx8xuMned3vUDrDRhqYirLPmsbjjxWPlCNRoxZp50/o=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/pysnmp-pyasn1/default.nix
+4 -3
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pysnmp-pyasn1";
version = "1.1.2";
version = "1.1.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "pysnmp";
repo = "pyasn1";
rev = "v${version}";
hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA=";
rev = "refs/tags/v${version}";
hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI=";
};
nativeBuildInputs = [
@@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python ASN.1 encoder and decoder";
homepage = "https://github.com/pysnmp/pyasn1";
changelog = "https://github.com/pysnmp/pyasn1/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ fab ];
};
pkgs/development/python-modules/reolink-aio/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.5.0";
version = "0.5.1";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
hash = "sha256-6fG7wKanw/ECsO7tqT69iTRjhhUpS2lKXMvW9FiqSi8=";
hash = "sha256-twfFPtTR2LIAbd5YuOgTG/j/xktLkTD3/9fjo514eXI=";
};
postPatch = ''
pkgs/development/python-modules/twilio/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.16.3";
version = "7.16.4";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-qgsJ/i8gcuirLp8O6XShgdfxdmFyK2H+oWkiP2795rA=";
hash = "sha256-OB7jW+I5oAE2TGPWmuIcXcABY1v1FMjo8UT83Xn4DB8=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/vt-py/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "vt-py";
version = "0.17.4";
version = "0.17.5";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "VirusTotal";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-4CmSsSZqFhH3rwctCJUqU4JdDxBgIxFnUZ5FQCBZXqg=";
hash = "sha256-O95W/J5y7qcR6PSzNQwOl0W19CyXifbq8okquESFSqM=";
};
propagatedBuildInputs = [
pkgs/os-specific/linux/molly-guard/default.nix
+1 -3
View File
@@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ dpkg ];
sourceRoot = ".";
unpackCmd = ''
dpkg-deb -x "$src" .
dpkg-deb -x "$src" source
'';
installPhase = ''