Merge master into staging-next
This commit is contained in:
commit
259e08cd22
|
@ -6666,6 +6666,12 @@
|
|||
fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A";
|
||||
}];
|
||||
};
|
||||
lorenzleutgeb = {
|
||||
email = "lorenz@leutgeb.xyz";
|
||||
github = "lorenzleutgeb";
|
||||
githubId = 542154;
|
||||
name = "Lorenz Leutgeb";
|
||||
};
|
||||
luis = {
|
||||
email = "luis.nixos@gmail.com";
|
||||
github = "Luis-Hebendanz";
|
||||
|
|
|
@ -1925,6 +1925,15 @@ Superuser created successfully.
|
|||
upgrade guide</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>julia</literal> now refers to
|
||||
<literal>julia-stable</literal> instead of
|
||||
<literal>julia-lts</literal>. In practice this means it has
|
||||
been upgraded from <literal>1.0.4</literal> to
|
||||
<literal>1.5.4</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -530,3 +530,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
- `security.pam.services.<name>.makeHomeDir` now uses `umask=0077` instead of `umask=0022` when creating the home directory.
|
||||
|
||||
- Loki has had another release. Some default values have been changed for the configuration and some configuration options have been renamed. For more details, please check [the upgrade guide](https://grafana.com/docs/loki/latest/upgrading/#240).
|
||||
|
||||
- `julia` now refers to `julia-stable` instead of `julia-lts`. In practice this means it has been upgraded from `1.0.4` to `1.5.4`.
|
||||
|
|
|
@ -318,7 +318,7 @@ in
|
|||
virtualisation.diskSize =
|
||||
mkOption {
|
||||
type = types.nullOr types.ints.positive;
|
||||
default = 512;
|
||||
default = 1024;
|
||||
description =
|
||||
''
|
||||
The disk size in megabytes of the virtual machine.
|
||||
|
|
|
@ -14,17 +14,17 @@ let
|
|||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "18sa2avr7xl8d0yaxs0df1pkwx7bbg21s8qf3mijdndsnhri0j1c";
|
||||
x86_64-darwin = "0vx0jiw341gsf00xw92fwwylnsi5c0ybrbj5syag4vkqddvp410k";
|
||||
aarch64-linux = "0jswwz1rxddaxz6v7hzpvddhx9dia5nk5rdsaj93q4gs3nda90hk";
|
||||
aarch64-darwin = "11lxg543kl85vbndqcq5zccycxfk63ijmka0jb973jfp0nm4iq60";
|
||||
armv7l-linux = "1ryr6k93z24yk0qqv3yasbp4achwpn0mpi6f28d2pvnsr9v9bh3y";
|
||||
x86_64-linux = "10p815dv86775ky90m96l11026xkhjwvrrhvviqw6g6hsayjqhia";
|
||||
x86_64-darwin = "1b8d7iw9v172viczdbcdxhf51dyshmx2665prv2pm0ygsy8yii3p";
|
||||
aarch64-linux = "155sbsmnapnzhkzkaggm80bkarh4l7dbqyhgy40mmdgqpyp3gx1v";
|
||||
aarch64-darwin = "1pnqjih37r4xqfjfrf8mhsbvmn62358rmf50rackqh5as50siwa2";
|
||||
armv7l-linux = "00k2fmivbsp8fyh9cy6vr6sq031f6marz4sbj1nrlzdl40wd30bi";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.62.0";
|
||||
version = "1.62.1";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "17vrz16q4fhc6b2rlddhz3m6y780gi9vzk28l0fcj12l9z5iprn9";
|
||||
x86_64-darwin = "1hn8sjmndmicl3gjrsb163wn5j36ij5b68mw7n6v6lqaf0a75xah";
|
||||
aarch64-linux = "0ikdy9c2ldrxyh8ij2qskv4m7j5azr1hbi53ddzgj1j6nms68lkh";
|
||||
armv7l-linux = "07a3kz4c8wzid0rd1rdzndy8c1cdg4hba7p1jmdf7zclr702i2j7";
|
||||
x86_64-linux = "1xblrp4xyw2pcifmzjmlbnmk7lhmlj002sfk28kyf1k5wdp54yv9";
|
||||
x86_64-darwin = "0ivvdxc4hmv9sh8ap0qy8yciz9pjkm1p1j60dh57y4ll6fdzbbrd";
|
||||
aarch64-linux = "0ssm27i12d7gkq31d1zma4zx5n5mgg0a8pj3sdk9jjjsa68b3pyr";
|
||||
armv7l-linux = "029shxcwnap28ys6lxml3yiiavw4lhnizf35f0a664vdzy1x5dpv";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
@ -31,7 +31,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.62.0";
|
||||
version = "1.62.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rmapi";
|
||||
version = "0.0.15";
|
||||
version = "0.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juruen";
|
||||
repo = "rmapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ju54JSd3Zyye5YGLPEOkhY93ONh0b7eDSnvJlIawizE=";
|
||||
sha256 = "sha256-KFoaZ0OAqwJm4tEUaEAGJ+70nHJUbxg0kvhm71mQB6E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-SE/0a8QUJsWoGwkSiZqYx1eXuOIL3avJujyg8iSdcBU=";
|
||||
vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubectl-evict-pod";
|
||||
version = "0.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rajatjindal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z4fJzU317p7K+klcDQAukXAfZOpHd3PlH5fKO0PgKHA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8VTrywlzrzoBEi/xOqkwhGW/R2B2oGqgh01Gv9FcW80=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules";
|
||||
homepage = "https://github.com/rajatjindal/kubectl-evict-pod";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.j4m3s ];
|
||||
};
|
||||
}
|
|
@ -26,13 +26,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-desktop";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-acsdPZoQcA62Y0jvHA5mqFX8WpeuYpAt+XpJnaEVYtI=";
|
||||
sha256 = "sha256-voqvpk17ov0xB57tY505/aHqd+9301pnjwGcTZHUc8I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -66,13 +66,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Uvlx6FFA5d50uTae9mVuSc6Vrx8jL8Hg3x8EYSmrT2U=";
|
||||
sha256 = "X3QkVt/gBgXA8JCjcoymJ5e8SeUK+FK71yhdoaBRf/Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -103,13 +103,6 @@ stdenv.mkDerivation rec {
|
|||
url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
|
||||
sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw=";
|
||||
})
|
||||
|
||||
# Make color picker in GTK work again
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1990
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/a3dcdaae30bdcbadec7ba3fa31c9eb0bb2a4c8c2.patch";
|
||||
sha256 = "1UTWGZ5CiVJVCYcepaf+A6/8X/s6jUMsYB4BJ7VTjxk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -46,13 +46,13 @@
|
|||
|
||||
let self = stdenv.mkDerivation rec {
|
||||
pname = "mutter";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-+oChp0QETYjr/Wd/8DID1ncF7SzWJOoGy7i1iUjN+J4=";
|
||||
sha256 = "WOY/0LxD81E08hMTr/Suv5LIKdbfTcmaBEoeN2aR4/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "40.5";
|
||||
version = "40.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-61N55MtspgUJLJQiEMGEJdA2dz2nZUHkO4nYIj+CuaQ=";
|
||||
sha256 = "sha256-8v8wWZjMRGNsH93iDNirHUQdSGOgWeLXpg+Od6/o8XE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,15 +1,14 @@
|
|||
{ lib, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
|
||||
|
||||
haskellPackages.mkDerivation rec {
|
||||
|
||||
pname = "carp";
|
||||
version = "0.5.0";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carp-lang";
|
||||
repo = "Carp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nTSMY8bq0b/JvE/XQGDC4St2sqdni12E5WQU5FXnuCg=";
|
||||
sha256 = "08ryk30ii24qsdpdq7bqi406ynv9nr8zy2pcv9n70ar8fxfw0859";
|
||||
};
|
||||
|
||||
buildTools = [ makeWrapper ];
|
||||
|
|
|
@ -2,19 +2,6 @@ diff --git a/Makefile b/Makefile
|
|||
index 86abc6958..a72f7b792 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -145,7 +145,12 @@ bumpversion:
|
||||
ABCREV = 4f5f73d
|
||||
ABCPULL = 1
|
||||
ABCURL ?= https://github.com/YosysHQ/abc
|
||||
+
|
||||
+ifneq ($(CONFIG),clang)
|
||||
+ABCMKARGS = CC=clang CXX="$(CXX)" LD=clang ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
|
||||
+else
|
||||
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
|
||||
+endif
|
||||
|
||||
# set ABCEXTERNAL = <abc-command> to use an external ABC instance
|
||||
# Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set.
|
||||
@@ -187,7 +192,7 @@ endif
|
||||
endif
|
||||
|
||||
|
|
|
@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchPhase = ''
|
||||
cd source
|
||||
sed -e "s@ldconfig@@" -i Makefile
|
||||
substituteInPlace Makefile \
|
||||
--replace 'ldconfig' ""
|
||||
'' + lib.optionalString (!stdenv.targetPlatform.isx86_64) ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '-DENABLE_SSE2' ""
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
|
|
|
@ -47,11 +47,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tracker-miners";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Bi+C3VSKYq7IUQWFAROskBpiK8UcbPxjIFY2Xof4GYE=";
|
||||
sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -6,20 +6,22 @@
|
|||
, freezegun
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiorecollect";
|
||||
version = "1.0.8";
|
||||
version = "2021.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5+v+TlLOgaIA8svpbgFSEWZAUVBRq3zqf8QbidKgygI=";
|
||||
sha256 = "sha256-cLutszJ8VXGcqb8kZv7Qn1ZD/LRYjVgQWQxNMHNd0UQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -34,13 +36,17 @@ buildPythonPackage rec {
|
|||
aresponses
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples directory as the files are prefixed with test_.
|
||||
"examples/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiorecollect" ];
|
||||
pythonImportsCheck = [
|
||||
"aiorecollect"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for the Recollect Waste API";
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cachetools";
|
||||
version = "4.2.3";
|
||||
version = "4.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
@ -15,14 +16,16 @@ buildPythonPackage rec {
|
|||
owner = "tkem";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9CHXvb+Nn3N2oWHwNbqKguzDO/q+4EnMZ50+E+MWS/A=";
|
||||
sha256 = "sha256-doPLl7Ooc2cKlTiS/dqLTKSkTlSgPFztIumAzciM0bc=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cachetools" ];
|
||||
pythonImportsCheck = [
|
||||
"cachetools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extensible memoizing collections and decorators";
|
||||
|
|
|
@ -1,50 +1,58 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, sqlite
|
||||
, cython
|
||||
, apsw
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, withPostgres ? false, psycopg2
|
||||
, withMysql ? false, mysql-connector
|
||||
, python
|
||||
, sqlite
|
||||
, withMysql ? false
|
||||
, mysql-connector
|
||||
, withPostgres ? false
|
||||
, psycopg2
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
pname = "peewee";
|
||||
version = "3.14.4";
|
||||
version = "3.14.8";
|
||||
format = "setuptools";
|
||||
|
||||
# pypi release does not provide tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "coleifer";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0x85swpaffysc05kka0mab87cnilzw1lpacfhcx5ayabh0i2qsh6";
|
||||
sha256 = "sha256-BJSM+7+VdW6SxN4/AXsX8NhQPdIFoYrVRVwR9OsJ3QE=";
|
||||
};
|
||||
|
||||
|
||||
checkInputs = [ flask ];
|
||||
|
||||
checkPhase = ''
|
||||
rm -r playhouse # avoid using the folder in the cwd
|
||||
python runtests.py
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
cython # compile speedups
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
apsw # sqlite performance improvement
|
||||
] ++ (lib.optional withPostgres psycopg2)
|
||||
++ (lib.optional withMysql mysql-connector);
|
||||
apsw
|
||||
] ++ lib.optional withPostgres psycopg2
|
||||
++ lib.optional withMysql mysql-connector;
|
||||
|
||||
checkInputs = [
|
||||
flask
|
||||
];
|
||||
|
||||
doCheck = withPostgres;
|
||||
|
||||
checkPhase = ''
|
||||
rm -r playhouse # avoid using the folder in the cwd
|
||||
${python.interpreter} runtests.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"peewee"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "a small, expressive orm";
|
||||
homepage = "http://peewee-orm.com";
|
||||
license = licenses.mit;
|
||||
description = "Python ORM with support for various database implementation";
|
||||
homepage = "http://peewee-orm.com";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,19 +15,21 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyairvisual";
|
||||
version = "5.0.9";
|
||||
version = "2021.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jfbwnipklpgxjgsgsx4j53anbqyrbgvj0wb84fvsm32jq9m8avf";
|
||||
sha256 = "sha256-Wj+ReRTYsP/XMrr74XPHrkHYT0sXfqcW/shbG3zNuH0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
|
@ -43,9 +45,14 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples directory as the files are prefixed with test_.
|
||||
"examples/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyairvisual" ];
|
||||
pythonImportsCheck = [
|
||||
"pyairvisual"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for interacting with AirVisual";
|
||||
|
|
|
@ -7,13 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfdns";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0df4695cb0h6f2lnn6dx4h5al2ra93zp1hzfaz07nj2gvirswp83";
|
||||
sha256 = "sha256-bsalfZEkZrBG0/SyEXCWOZyrhOYU/3YJR/78FQTpXYk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -23,7 +24,10 @@ buildPythonPackage rec {
|
|||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pycfdns" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pycfdns"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for updating Cloudflare DNS A records";
|
||||
|
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyiqvia";
|
||||
version = "1.1.0";
|
||||
version = "2021.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-uDcBpPHh+wQHI2vGjnumwVGt5ZOreVq+L3kOam97uW4=";
|
||||
sha256 = "sha256-FCavSy33fkXlboRAmGr0BkEkXLTOzsyGXQkws0LqiJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -41,10 +41,14 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
"examples/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyiqvia" ];
|
||||
pythonImportsCheck = [
|
||||
"pyiqvia"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python3 API for IQVIA data";
|
||||
|
|
|
@ -8,23 +8,27 @@
|
|||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyopenuv";
|
||||
version = "2.2.1";
|
||||
version = "2021.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9hpXVKCpVbUAoTxd5mHP9NK1dZxbrQUxrQrOEVHpaPo=";
|
||||
sha256 = "sha256-3zTyW3eXOA9frSAy4g7iWhymc1hBo0hrxIgPLMqrLTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
|
@ -36,13 +40,18 @@ buildPythonPackage rec {
|
|||
asynctest
|
||||
pytest-asyncio
|
||||
pytest-aiohttp
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
pytestFlagsArray = [ "--ignore examples/" ];
|
||||
pythonImportsCheck = [ "pyopenuv" ];
|
||||
disabledTestPaths = [
|
||||
# Ignore the examples as they are prefixed with test_
|
||||
"examples/"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyopenuv"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API to retrieve data from openuv.io";
|
||||
|
|
|
@ -6,13 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "starkbank-ecdsa";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starkbank";
|
||||
repo = "ecdsa-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TYp8eIzO8Bn1hgye7PpIywVEV0tQtJ3HaYjCnn4/57w=";
|
||||
sha256 = "sha256-4QFAtGqHJZSVyrGPuMdJwvF761/P6YAHjjKmCpPyGdU=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -5,17 +5,20 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.25.12";
|
||||
version = "2.26.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-BVhjwKrPj48pzSyg0zIO/fOfKOcd5o0yd2F1HS9iu1c=";
|
||||
sha256 = "sha256-317Iw0tBOkLrs45Plr3raAkLh1vfzFE43IKYnJVEWIM=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "requests-stubs" ];
|
||||
pythonImportsCheck = [
|
||||
"requests-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for requests";
|
||||
|
|
|
@ -47,7 +47,7 @@ rec {
|
|||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = [ java ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Enterprise-grade build system";
|
||||
longDescription = ''
|
||||
Gradle is a build system which offers you ease, power and freedom.
|
||||
|
@ -58,18 +58,14 @@ rec {
|
|||
build-by-convention behavior.
|
||||
'';
|
||||
homepage = "http://www.gradle.org/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ lorenzleutgeb ];
|
||||
};
|
||||
};
|
||||
|
||||
gradle_latest = gradle_7;
|
||||
|
||||
# NOTE: 7.3 is a candidate.
|
||||
gradle_7 = gradle_7_2;
|
||||
|
||||
gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-rc-3-spec.nix));
|
||||
gradle_7_2 = gradleGen (gradleSpec (import ./gradle-7.2-spec.nix));
|
||||
gradle_latest = gradle_7_3;
|
||||
gradle_7_3 = gradleGen (gradleSpec (import ./gradle-7.3-spec.nix));
|
||||
gradle_6_9 = gradleGen (gradleSpec (import ./gradle-6.9.1-spec.nix));
|
||||
|
||||
# NOTE: No GitHub Release for this release, so update.sh does not work.
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
version = "7.3-rc-3";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "0401q4qpl36a2vnlrlsblflfiiy3b95gyj2wj62hzc1x00hbfznm";
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
version = "7.3";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy";
|
||||
}
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YXIEM8COtjc3yD8gxoeoJwkGyJwMCCn40591iO6ERxc=";
|
||||
sha256 = "sha256-ZpTwqwxh1/Yz5MBlv1KvD/sBTaFb5m7cQXLkUAGZegc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4PcYnpoRvl01n4Y4usrlLejWwcB5BJnFGqqfbqLD1gI=";
|
||||
cargoSha256 = "sha256-JwljoLTEolKCaob7IPYan5N9YIZvnlj1uRZ1mNACGbQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,19 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-script";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fornwall";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0jz8hlvl31c5h8whd6pnpmslw6w6alkxijd9lhgric1yypiym9x3";
|
||||
sha256 = "sha256-B/xh0eYRJxjjIEXdxmLz6usQvo4v/HQK5VNnnjcDBjM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hg0QtxR1qm/x8G6HoN7xAyOwh9jiQvX2wWYjUR8YvMs=";
|
||||
cargoSha256 = "sha256-7qMrrs6K+mJVDHNkGQDb6abM18RyBPToseTNM7ogdQ0=";
|
||||
|
||||
# TODO: switch to `cargoCheckType = "false"` after #138822 is merged
|
||||
# tests only work in debug mode
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -39,11 +39,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
|
||||
sha256 = "sha256-1M77zuAqunfAjK2Jvu08Z7inCMdBYX92AmyMD9eaue8=";
|
||||
sha256 = "sha256-N9D4K3+/Nt3N3/uHDD+jD6tzL0FMwmV7l+WGjGYa3Yk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
56
pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
Normal file
56
pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
Normal file
|
@ -0,0 +1,56 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, gnu-efi
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fwupd-efi";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "1w879qxlnsaz5xyp168a08f2p8yrgfpkfycls28jw8qxmz6g20aw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnu-efi
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
efi/generate_binary.py \
|
||||
efi/generate_sbat.py
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
"-Defi-includedir=${gnu-efi}/include/efi"
|
||||
"-Defi-libdir=${gnu-efi}/lib"
|
||||
"-Defi-ldsdir=${gnu-efi}/lib"
|
||||
"-Defi_sbat_distro_id=nixos"
|
||||
"-Defi_sbat_distro_summary=NixOS"
|
||||
"-Defi_sbat_distro_pkgname=${pname}"
|
||||
"-Defi_sbat_distro_version=${version}"
|
||||
"-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd-efi&from=0&size=50&sort=relevance&query=fwupd-efi"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fwupd.org/";
|
||||
maintainers = with maintainers; [ maxeaubrey ];
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -1,21 +1,21 @@
|
|||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 50154569..f8058a8e 100644
|
||||
index f10d4ff6..2dc66fb6 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -17,7 +17,7 @@ endif
|
||||
@@ -21,7 +21,7 @@ endif
|
||||
|
||||
if build_standalone
|
||||
install_data(['daemon.conf'],
|
||||
- install_dir : join_paths(sysconfdir, 'fwupd')
|
||||
+ install_dir : join_paths(sysconfdir_install, 'fwupd')
|
||||
)
|
||||
endif
|
||||
|
||||
install_data(['power.quirk'],
|
||||
install_dir: join_paths(datadir, 'fwupd', 'quirks.d'))
|
||||
diff --git a/data/pki/meson.build b/data/pki/meson.build
|
||||
index 94bb0b6f..1ea6a9ac 100644
|
||||
index dcd9e128..ff137f3a 100644
|
||||
--- a/data/pki/meson.build
|
||||
+++ b/data/pki/meson.build
|
||||
@@ -3,24 +3,23 @@ install_data([
|
||||
@@ -2,24 +2,23 @@ install_data([
|
||||
'GPG-KEY-Linux-Foundation-Firmware',
|
||||
'GPG-KEY-Linux-Vendor-Firmware-Service',
|
||||
],
|
||||
|
@ -45,19 +45,28 @@ index 94bb0b6f..1ea6a9ac 100644
|
|||
)
|
||||
-
|
||||
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
|
||||
index 826a3c1d..b78db663 100644
|
||||
index 02d8777b..2c89d593 100644
|
||||
--- a/data/remotes.d/meson.build
|
||||
+++ b/data/remotes.d/meson.build
|
||||
@@ -3,7 +3,7 @@ if build_daemon and get_option('lvfs')
|
||||
'lvfs.conf',
|
||||
@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false'
|
||||
install_data([
|
||||
'lvfs-testing.conf',
|
||||
],
|
||||
- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
|
||||
+ install_dir : join_paths(sysconfdir_install, 'fwupd', 'remotes.d')
|
||||
)
|
||||
con3 = configuration_data()
|
||||
if get_option('lvfs') == 'disabled'
|
||||
@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false'
|
||||
output : 'lvfs.conf',
|
||||
configuration : con3,
|
||||
install: true,
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
i18n.merge_file(
|
||||
input: 'lvfs.metainfo.xml',
|
||||
@@ -37,12 +37,12 @@ configure_file(
|
||||
@@ -49,12 +49,12 @@ configure_file(
|
||||
output : 'vendor.conf',
|
||||
configuration : con2,
|
||||
install: true,
|
||||
|
@ -73,10 +82,10 @@ index 826a3c1d..b78db663 100644
|
|||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b075ca89..8d504d3c 100644
|
||||
index 7557cd4a..4c98de6d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -194,6 +194,12 @@ endif
|
||||
@@ -190,6 +190,12 @@ endif
|
||||
mandir = join_paths(prefix, get_option('mandir'))
|
||||
localedir = join_paths(prefix, get_option('localedir'))
|
||||
|
||||
|
@ -90,43 +99,44 @@ index b075ca89..8d504d3c 100644
|
|||
gio = dependency('gio-2.0', version : '>= 2.45.8')
|
||||
giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index bc76c0ab..8a67d012 100644
|
||||
index 94f73898..5de6cc7b 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,3 +1,4 @@
|
||||
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
|
||||
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
|
||||
option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
|
||||
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')
|
||||
option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation')
|
||||
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
|
||||
index ed4eee70..76dbdb1d 100644
|
||||
index e9f12879..a0126dbb 100644
|
||||
--- a/plugins/dell-esrt/meson.build
|
||||
+++ b/plugins/dell-esrt/meson.build
|
||||
@@ -37,5 +37,5 @@ configure_file(
|
||||
@@ -38,6 +38,6 @@ configure_file(
|
||||
output : 'dell-esrt.conf',
|
||||
configuration : con2,
|
||||
install: true,
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
||||
)
|
||||
endif
|
||||
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
|
||||
index 205d1394..3223f404 100644
|
||||
index 5263048c..c46fac64 100644
|
||||
--- a/plugins/redfish/meson.build
|
||||
+++ b/plugins/redfish/meson.build
|
||||
@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish',
|
||||
@@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish',
|
||||
)
|
||||
|
||||
install_data(['redfish.conf'],
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd')
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd'),
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd'),
|
||||
install_mode: 'rw-r-----',
|
||||
)
|
||||
|
||||
if get_option('tests')
|
||||
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
|
||||
index 6b2368fb..2bd06fed 100644
|
||||
index 646ed6cb..8d7c59aa 100644
|
||||
--- a/plugins/thunderbolt/meson.build
|
||||
+++ b/plugins/thunderbolt/meson.build
|
||||
@@ -31,7 +31,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
|
||||
@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
|
||||
)
|
||||
|
||||
install_data(['thunderbolt.conf'],
|
||||
|
@ -136,10 +146,19 @@ index 6b2368fb..2bd06fed 100644
|
|||
# we use functions from 2.52 in the tests
|
||||
if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
|
||||
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
|
||||
index 0b793a07..ebd3e5ea 100644
|
||||
index 708586b0..f29536b1 100644
|
||||
--- a/plugins/uefi-capsule/meson.build
|
||||
+++ b/plugins/uefi-capsule/meson.build
|
||||
@@ -97,7 +97,7 @@ if get_option('man')
|
||||
@@ -21,7 +21,7 @@ if host_machine.system() == 'linux'
|
||||
output : '35_fwupd',
|
||||
configuration : con2,
|
||||
install: true,
|
||||
- install_dir: join_paths(sysconfdir, 'grub.d')
|
||||
+ install_dir: join_paths(sysconfdir_install, 'grub.d')
|
||||
)
|
||||
elif host_machine.system() == 'freebsd'
|
||||
backend_srcs += 'fu-uefi-backend-freebsd.c'
|
||||
@@ -116,7 +116,7 @@ if get_option('man')
|
||||
endif
|
||||
|
||||
install_data(['uefi_capsule.conf'],
|
||||
|
@ -147,15 +166,4 @@ index 0b793a07..ebd3e5ea 100644
|
|||
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
|
||||
)
|
||||
|
||||
if get_option('tests')
|
||||
diff --git a/plugins/upower/meson.build b/plugins/upower/meson.build
|
||||
index 290a3eb6..9ab2f452 100644
|
||||
--- a/plugins/upower/meson.build
|
||||
+++ b/plugins/upower/meson.build
|
||||
@@ -23,5 +23,5 @@ shared_module('fu_plugin_upower',
|
||||
)
|
||||
|
||||
install_data(['upower.conf'],
|
||||
- install_dir: join_paths(sysconfdir, 'fwupd')
|
||||
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
|
||||
)
|
||||
# add all the .po files as inputs to watch
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
# Updating? Keep $out/etc synchronized with passthru keys
|
||||
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, gtk-doc
|
||||
, pkg-config
|
||||
, gobject-introspection
|
||||
|
@ -15,13 +16,11 @@
|
|||
, sqlite
|
||||
, libarchive
|
||||
, curl
|
||||
, help2man
|
||||
, libjcat
|
||||
, libxslt
|
||||
, elfutils
|
||||
, libsmbios
|
||||
, efivar
|
||||
, gnu-efi
|
||||
, valgrind
|
||||
, meson
|
||||
, libuuid
|
||||
|
@ -31,6 +30,7 @@
|
|||
, ninja
|
||||
, gcab
|
||||
, gnutls
|
||||
, protobufc
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, json-glib
|
||||
|
@ -40,32 +40,24 @@
|
|||
, vala
|
||||
, makeFontsConf
|
||||
, freefont_ttf
|
||||
, cairo
|
||||
, freetype
|
||||
, fontconfig
|
||||
, pango
|
||||
, tpm2-tss
|
||||
, bubblewrap
|
||||
, efibootmgr
|
||||
, flashrom
|
||||
, tpm2-tools
|
||||
, fwupd-efi
|
||||
, nixosTests
|
||||
, runCommand
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.withPackages (p: with p; [
|
||||
pygobject3
|
||||
pycairo
|
||||
pillow
|
||||
setuptools
|
||||
]);
|
||||
|
||||
installedTestsPython = python3.withPackages (p: with p; [
|
||||
pygobject3
|
||||
requests
|
||||
]);
|
||||
|
||||
isx86 = stdenv.isx86_64 || stdenv.isi686;
|
||||
|
||||
# Dell isn't supported on Aarch64
|
||||
|
@ -89,9 +81,38 @@ let
|
|||
exec python3 -c "$buildCommandPython"
|
||||
'';
|
||||
|
||||
test-firmware =
|
||||
let
|
||||
version = "unstable-2021-11-02";
|
||||
src = fetchFromGitHub {
|
||||
name = "fwupd-test-firmware-${version}";
|
||||
owner = "fwupd";
|
||||
repo = "fwupd-test-firmware";
|
||||
rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d";
|
||||
sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA=";
|
||||
passthru = {
|
||||
inherit src version; # For update script
|
||||
updateScript = unstableGitUpdater {
|
||||
url = "${test-firmware.meta.homepage}.git";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
src // {
|
||||
meta = src.meta // {
|
||||
# For update script
|
||||
position =
|
||||
let
|
||||
pos = builtins.unsafeGetAttrPos "updateScript" test-firmware;
|
||||
in
|
||||
pos.file + ":" + toString pos.line;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "fwupd";
|
||||
version = "1.5.12";
|
||||
version = "1.7.1";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
|
@ -100,27 +121,27 @@ let
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
sha256 = "sha256-BluwLlm6s/2H/USARQpAvDR0+X8WP/q0h8VvxA6Qftc=";
|
||||
sha256 = "sha256-rlbOtEt4byH1TRM6xwvF2cuM1L2gFnM5xmmiKNpn+jw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not try to create useless paths in /var.
|
||||
./fix-paths.patch
|
||||
|
||||
# Allow installing
|
||||
# Since /etc is the domain of NixOS, not Nix,
|
||||
# we cannot install files there.
|
||||
# Let’s install the files to $prefix/etc
|
||||
# while still reading them from /etc.
|
||||
# NixOS module for fwupd will take take care of copying the files appropriately.
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
|
||||
# Install plug-ins and libfwupdplugin to out,
|
||||
# Install plug-ins and libfwupdplugin to $out output,
|
||||
# they are not really part of the library.
|
||||
./install-fwupdplugin-to-out.patch
|
||||
|
||||
# Installed tests are installed to different output
|
||||
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
|
||||
(substituteAll {
|
||||
src = ./installed-tests-path.patch;
|
||||
# Needs a different set of modules than po/make-images.
|
||||
inherit installedTestsPython;
|
||||
})
|
||||
./installed-tests-path.patch
|
||||
|
||||
# Tests detect fwupd is installed when prefix is /usr.
|
||||
./fix-install-detection.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -136,8 +157,8 @@ let
|
|||
gnutls
|
||||
docbook_xml_dtd_43
|
||||
docbook-xsl-nons
|
||||
help2man
|
||||
libxslt
|
||||
protobufc # for protoc
|
||||
python
|
||||
wrapGAppsHook
|
||||
vala
|
||||
|
@ -151,7 +172,6 @@ let
|
|||
libarchive
|
||||
curl
|
||||
elfutils
|
||||
gnu-efi
|
||||
libgudev
|
||||
colord
|
||||
libjcat
|
||||
|
@ -159,18 +179,17 @@ let
|
|||
json-glib
|
||||
umockdev
|
||||
bash-completion
|
||||
cairo
|
||||
freetype
|
||||
fontconfig
|
||||
pango
|
||||
tpm2-tss
|
||||
efivar
|
||||
fwupd-efi
|
||||
protobufc
|
||||
] ++ lib.optionals haveDell [
|
||||
libsmbios
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtkdoc=true"
|
||||
"-Ddocs=gtkdoc"
|
||||
"-Dplugin_dummy=true"
|
||||
# We are building the official releases.
|
||||
"-Dsupported_build=true"
|
||||
|
@ -180,17 +199,10 @@ let
|
|||
"-Dudevdir=lib/udev"
|
||||
"-Dsystemd_root_prefix=${placeholder "out"}"
|
||||
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
|
||||
"-Defi-libdir=${gnu-efi}/lib"
|
||||
"-Defi-ldsdir=${gnu-efi}/lib"
|
||||
"-Defi-includedir=${gnu-efi}/include/efi"
|
||||
"-Defi_sbat_distro_id=nixos"
|
||||
"-Defi_sbat_distro_summary=NixOS"
|
||||
"-Defi_sbat_distro_pkgname=fwupd"
|
||||
"-Defi_sbat_distro_version=${version}"
|
||||
"-Defi_sbat_distro_url=https://search.nixos.org/packages?channel=unstable&show=fwupd&from=0&size=50&sort=relevance&query=fwupd"
|
||||
"--localstatedir=/var"
|
||||
"--sysconfdir=/etc"
|
||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||
"-Defi_os_dir=nixos"
|
||||
|
||||
# We do not want to place the daemon into lib (cyclic reference)
|
||||
"--libexecdir=${placeholder "out"}/libexec"
|
||||
|
@ -232,13 +244,8 @@ let
|
|||
|
||||
postPatch = ''
|
||||
patchShebangs \
|
||||
contrib/get-version.py \
|
||||
contrib/generate-version-script.py \
|
||||
meson_post_install.sh \
|
||||
plugins/uefi-capsule/efi/generate_sbat.py \
|
||||
plugins/uefi-capsule/efi/generate_binary.py \
|
||||
po/make-images \
|
||||
po/make-images.sh \
|
||||
po/test-deps
|
||||
'';
|
||||
|
||||
|
@ -246,18 +253,20 @@ let
|
|||
addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share"
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
let
|
||||
testFw = fetchFromGitHub {
|
||||
owner = "fwupd";
|
||||
repo = "fwupd-test-firmware";
|
||||
rev = "c13bfb26cae5f4f115dd4e08f9f00b3cb9acc25e";
|
||||
sha256 = "US81i7mtLEe85KdWz5r+fQTk61IhqjVkzykBaBPuKL4=";
|
||||
};
|
||||
in ''
|
||||
# These files have weird licenses so they are shipped separately.
|
||||
cp --recursive --dereference "${testFw}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd"
|
||||
'';
|
||||
preInstall = ''
|
||||
# We have pkexec on PATH so Meson will try to use it when installation fails
|
||||
# due to being unable to write to e.g. /etc.
|
||||
# Let’s pretend we already ran pkexec –
|
||||
# the pkexec on PATH would complain it lacks setuid bit,
|
||||
# obscuring the underlying error.
|
||||
# https://github.com/mesonbuild/meson/blob/492cc9bf95d573e037155b588dc5110ded4d9a35/mesonbuild/minstall.py#L558
|
||||
export PKEXEC_UID=-1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# These files have weird licenses so they are shipped separately.
|
||||
cp --recursive --dereference "${test-firmware}/installed-tests/tests" "$installedTests/libexec/installed-tests/fwupd"
|
||||
'';
|
||||
|
||||
preFixup = let
|
||||
binPath = [
|
||||
|
@ -294,7 +303,6 @@ let
|
|||
"fwupd/remotes.d/vendor.conf"
|
||||
"fwupd/remotes.d/vendor-directory.conf"
|
||||
"fwupd/thunderbolt.conf"
|
||||
"fwupd/upower.conf"
|
||||
"fwupd/uefi_capsule.conf"
|
||||
"pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
|
||||
"pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
|
||||
|
@ -302,6 +310,7 @@ let
|
|||
"pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
|
||||
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
|
||||
"pki/fwupd-metadata/LVFS-CA.pem"
|
||||
"grub.d/35_fwupd"
|
||||
] ++ lib.optionals haveDell [
|
||||
"fwupd/remotes.d/dell-esrt.conf"
|
||||
] ++ lib.optionals haveRedfish [
|
||||
|
@ -315,6 +324,9 @@ let
|
|||
"invalid"
|
||||
];
|
||||
|
||||
# For updating.
|
||||
inherit test-firmware;
|
||||
|
||||
tests = let
|
||||
listToPy = list: "[${lib.concatMapStringsSep ", " (f: "'${f}'") list}]";
|
||||
in {
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
|
||||
index 4710c769..1c68fdb9 100644
|
||||
--- a/plugins/redfish/fu-self-test.c
|
||||
+++ b/plugins/redfish/fu-self-test.c
|
||||
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
|
||||
const gchar *builddir = g_getenv("G_TEST_BUILDDIR");
|
||||
if (builddir == NULL)
|
||||
return FALSE;
|
||||
- return g_str_has_prefix(builddir, "/usr");
|
||||
+ return g_str_has_prefix(builddir, "/nix");
|
||||
}
|
||||
|
||||
static void
|
|
@ -1,8 +0,0 @@
|
|||
diff --git a/data/builder/meson.build b/data/builder/meson.build
|
||||
index c7a430c0..e69de29b 100644
|
||||
--- a/data/builder/meson.build
|
||||
+++ b/data/builder/meson.build
|
||||
@@ -1,3 +0,0 @@
|
||||
-install_data('README.md',
|
||||
- install_dir : join_paths(localstatedir, 'lib', 'fwupd', 'builder')
|
||||
-)
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build
|
||||
index 0abcd45c..51cbc912 100644
|
||||
index d6a2ed68..12c82a95 100644
|
||||
--- a/libfwupdplugin/meson.build
|
||||
+++ b/libfwupdplugin/meson.build
|
||||
@@ -114,7 +114,8 @@
|
||||
@@ -216,7 +216,8 @@ fwupdplugin = library(
|
||||
],
|
||||
link_args : vflag,
|
||||
link_depends : fwupdplugin_mapfile,
|
||||
|
@ -12,26 +12,26 @@ index 0abcd45c..51cbc912 100644
|
|||
)
|
||||
|
||||
fwupdplugin_pkgg = import('pkgconfig')
|
||||
@@ -167,7 +168,8 @@
|
||||
'GUsb-1.0',
|
||||
@@ -276,7 +277,8 @@ if get_option('introspection')
|
||||
girtargets,
|
||||
fwupd_gir[0],
|
||||
],
|
||||
- install : true
|
||||
+ install : true,
|
||||
+ install_dir_typelib : bindir / '..' / 'lib' / 'girepository-1.0',
|
||||
)
|
||||
gnome.generate_vapi('fwupdplugin',
|
||||
sources : fwupd_gir[0],
|
||||
|
||||
# Verify the map file is correct -- note we can't actually use the generated
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b1a523d2..00125997 100644
|
||||
index 38aa36b0..3fb7e579 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -389,7 +389,7 @@
|
||||
@@ -521,7 +521,7 @@ if build_standalone
|
||||
if host_machine.system() == 'windows'
|
||||
plugin_dir = 'fwupd-plugins-3'
|
||||
plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)
|
||||
else
|
||||
- plugin_dir = join_paths(libdir, 'fwupd-plugins-3')
|
||||
+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-3')
|
||||
- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current))
|
||||
+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current))
|
||||
endif
|
||||
conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir)
|
||||
endif
|
||||
|
|
|
@ -1,13 +1,3 @@
|
|||
diff --git a/data/device-tests/hardware.py b/data/device-tests/hardware.py
|
||||
index 7f1e1907..10fee1b8 100755
|
||||
--- a/data/device-tests/hardware.py
|
||||
+++ b/data/device-tests/hardware.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python3
|
||||
+#!@installedTestsPython@/bin/python3
|
||||
# pylint: disable=wrong-import-position,too-many-locals,unused-argument,wrong-import-order
|
||||
#
|
||||
# Copyright (C) 2017 Richard Hughes <richard@hughsie.com>
|
||||
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
|
||||
index adadbcdd..1b51bb9c 100644
|
||||
--- a/data/installed-tests/meson.build
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "heisenbridge";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
# Use the release tarball because it has the version set correctly using the
|
||||
# version.txt file.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz";
|
||||
sha256 = "sha256-+FnpECMDu7d7IM6vmiqP2mA/WJx2WVSzI01tLzkrvpk=";
|
||||
sha256 = "sha256-hg0PnWbec/iQbv4eRVy6JDt/OJ+EOzN+o6VrUGL4YtE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
36
pkgs/tools/archivers/unrar-wrapper/default.nix
Normal file
36
pkgs/tools/archivers/unrar-wrapper/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, unar }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "unrar-wrapper";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openSUSE";
|
||||
repo = "unrar_wrapper";
|
||||
rev = "unrar_wrapper-${version}";
|
||||
sha256 = "sha256-HjrUif8MrbtLjRQMAPZ/Y2o43rGSDj0HHY4fZQfKz5w=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" "${lib.makeBinPath [ unar ]}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
ln -s $out/bin/unrar_wrapper $out/bin/unrar
|
||||
rm -rf $out/nix-support/propagated-build-inputs
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/openSUSE/unrar_wrapper";
|
||||
description = "Backwards compatibility between unar and unrar";
|
||||
longDescription = ''
|
||||
unrar_wrapper is a wrapper python script that transforms the basic UnRAR commands
|
||||
to unar and lsar calls in order to provide a backwards compatibility.
|
||||
'';
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
};
|
||||
}
|
5
pkgs/tools/archivers/unrar-wrapper/setup-hook.sh
Normal file
5
pkgs/tools/archivers/unrar-wrapper/setup-hook.sh
Normal file
|
@ -0,0 +1,5 @@
|
|||
unpackCmdHooks+=(_tryUnrar)
|
||||
_tryUnrar() {
|
||||
if ! [[ "$curSrc" =~ \.rar$ ]]; then return 1; fi
|
||||
unrar x "$curSrc" >/dev/null
|
||||
}
|
|
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/myint/perceptualdiff";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ uri-canva ];
|
||||
platforms = platforms.x86;
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.hostPlatform.system == "aarch64-darwin";
|
||||
};
|
||||
}
|
||||
|
|
23
pkgs/tools/misc/apkeep/default.nix
Normal file
23
pkgs/tools/misc/apkeep/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ lib, fetchCrate, rustPlatform, openssl, pkg-config }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "apkeep";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-RTzYvDkmE0kgl4FSOSjDuQ5G1E0ugFU41zVAMMroofM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-YFs2AOMGp0WNrceK14AnigZdJl+UsQdUchpxaI7HSXw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command-line tool for downloading APK files from various sources";
|
||||
homepage = "https://github.com/EFForg/apkeep";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jyooru ];
|
||||
};
|
||||
}
|
|
@ -1,22 +1,21 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }:
|
||||
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-outdated";
|
||||
version = "0.9.17";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kbknapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ian/vXGoPHecguQUp2IUgdLW6Ll8OdCA2W0WmoYPDrI=";
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "19r4nv28iq4cmzs5j127qgvdf7y3pfmgjp6jzzbb8b5xj7w06jhl";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eDu1dAs543AryUEsCY9COHrvuamQocCk0nBXDIdFmYs=";
|
||||
cargoSha256 = "1rf3sxprra9s76iip2xf82kclgs83fhnlx9ykl9hhn2y0z8r3342";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
libiconv
|
||||
curl
|
||||
];
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-11-06";
|
||||
version = "2021-11-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pyzK6Z62gvuvi8FilNySyp78i4A2SLSFLY8WsSNdFQ0=";
|
||||
sha256 = "sha256-V/iQvA2jxeddzmzoVNJ4eoyEjkrkfws7pLw6akbBDaA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.9.0";
|
||||
version = "5.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bJvIm2ZmbfSI+RtaBYlUYVVF7Q7vKwtKMCUC8tS8ZOI=";
|
||||
sha256 = "sha256-JXjlK/XTIJeJj8do7JsoZQ8kE+bgy6czXAam/cj7IQo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac";
|
||||
|
|
|
@ -321,7 +321,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) AppKit IOKit;
|
||||
};
|
||||
|
||||
mix2nix = callPackage ../development/tools/mix2nix/default.nix { };
|
||||
mix2nix = callPackage ../development/tools/mix2nix { };
|
||||
|
||||
prisma-engines = callPackage ../development/tools/database/prisma-engines {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
@ -493,7 +493,7 @@ with pkgs;
|
|||
|
||||
prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
|
||||
|
||||
global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { };
|
||||
global-platform-pro = callPackage ../development/tools/global-platform-pro { };
|
||||
|
||||
graph-easy = callPackage ../tools/graphics/graph-easy { };
|
||||
|
||||
|
@ -1373,7 +1373,7 @@ with pkgs;
|
|||
|
||||
awless = callPackage ../tools/virtualization/awless { };
|
||||
|
||||
berglas = callPackage ../tools/admin/berglas/default.nix { };
|
||||
berglas = callPackage ../tools/admin/berglas { };
|
||||
|
||||
betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { };
|
||||
|
||||
|
@ -1669,7 +1669,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { };
|
||||
fitnesstrax = callPackage ../applications/misc/fitnesstrax { };
|
||||
|
||||
flavours = callPackage ../applications/misc/flavours { };
|
||||
|
||||
|
@ -4766,7 +4766,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) AppKit Security;
|
||||
};
|
||||
|
||||
timeline = callPackage ../applications/office/timeline/default.nix { };
|
||||
timeline = callPackage ../applications/office/timeline { };
|
||||
|
||||
tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; };
|
||||
tsm-client-withGui = callPackage ../tools/backup/tsm-client { };
|
||||
|
@ -8079,7 +8079,7 @@ with pkgs;
|
|||
|
||||
offlineimap = callPackage ../tools/networking/offlineimap { };
|
||||
|
||||
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { };
|
||||
ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
|
||||
|
||||
ogdf = callPackage ../development/libraries/ogdf { };
|
||||
|
||||
|
@ -9424,7 +9424,7 @@ with pkgs;
|
|||
|
||||
slides = callPackage ../applications/misc/slides { };
|
||||
|
||||
slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { };
|
||||
slirp4netns = callPackage ../tools/networking/slirp4netns { };
|
||||
|
||||
slsnif = callPackage ../tools/misc/slsnif { };
|
||||
|
||||
|
@ -9725,7 +9725,7 @@ with pkgs;
|
|||
|
||||
swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { };
|
||||
|
||||
swapview = callPackage ../os-specific/linux/swapview/default.nix { };
|
||||
swapview = callPackage ../os-specific/linux/swapview { };
|
||||
|
||||
swtpm = callPackage ../tools/security/swtpm { };
|
||||
|
||||
|
@ -10616,6 +10616,8 @@ with pkgs;
|
|||
|
||||
unrar = callPackage ../tools/archivers/unrar { };
|
||||
|
||||
unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { };
|
||||
|
||||
vul = callPackage ../applications/misc/vul { };
|
||||
|
||||
xar = callPackage ../tools/compression/xar { };
|
||||
|
@ -11450,7 +11452,7 @@ with pkgs;
|
|||
|
||||
scry = callPackage ../development/tools/scry { };
|
||||
|
||||
dasm = callPackage ../development/compilers/dasm/default.nix { };
|
||||
dasm = callPackage ../development/compilers/dasm { };
|
||||
|
||||
dbmate = callPackage ../development/tools/database/dbmate { };
|
||||
|
||||
|
@ -12285,7 +12287,7 @@ with pkgs;
|
|||
|
||||
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
|
||||
|
||||
juniper = callPackage ../development/compilers/juniper/default.nix { };
|
||||
juniper = callPackage ../development/compilers/juniper { };
|
||||
|
||||
julia_10 = callPackage ../development/compilers/julia/1.0.nix {
|
||||
gmp = gmp6;
|
||||
|
@ -12299,14 +12301,14 @@ with pkgs;
|
|||
|
||||
julia-lts = julia_10;
|
||||
julia-stable = julia_15;
|
||||
julia = julia-lts;
|
||||
julia = julia-stable;
|
||||
|
||||
julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { };
|
||||
julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
|
||||
|
||||
julia-lts-bin = julia_10-bin;
|
||||
julia-stable-bin = julia_16-bin;
|
||||
julia-bin = julia-lts-bin;
|
||||
julia-bin = julia-stable-bin;
|
||||
|
||||
jwasm = callPackage ../development/compilers/jwasm { };
|
||||
|
||||
|
@ -12888,7 +12890,7 @@ with pkgs;
|
|||
sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {};
|
||||
sbcl = sbcl_2_1_9;
|
||||
|
||||
roswell = callPackage ../development/tools/roswell/default.nix { };
|
||||
roswell = callPackage ../development/tools/roswell { };
|
||||
|
||||
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
|
||||
scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
|
||||
|
@ -12896,7 +12898,7 @@ with pkgs;
|
|||
scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; };
|
||||
|
||||
scala = scala_2_13;
|
||||
scala-runners = callPackage ../development/compilers/scala-runners/default.nix {
|
||||
scala-runners = callPackage ../development/compilers/scala-runners {
|
||||
coursier = coursier.override { jre = jdk8; };
|
||||
};
|
||||
|
||||
|
@ -13159,7 +13161,7 @@ with pkgs;
|
|||
|
||||
clips = callPackage ../development/interpreters/clips { };
|
||||
|
||||
cliscord = callPackage ../misc/cliscord/default.nix { };
|
||||
cliscord = callPackage ../misc/cliscord { };
|
||||
|
||||
clisp = callPackage ../development/interpreters/clisp { };
|
||||
clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
|
||||
|
@ -13497,7 +13499,7 @@ with pkgs;
|
|||
setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {};
|
||||
|
||||
# These pyside tools do not provide any Python modules and are meant to be here.
|
||||
# See ../development/python-modules/pyside/default.nix for details.
|
||||
# See ../development/python-modules/pyside for details.
|
||||
pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { };
|
||||
pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { };
|
||||
|
||||
|
@ -13736,7 +13738,7 @@ with pkgs;
|
|||
|
||||
or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {};
|
||||
|
||||
rappel = callPackage ../development/misc/rappel/default.nix { };
|
||||
rappel = callPackage ../development/misc/rappel { };
|
||||
|
||||
pharo-vms = callPackage ../development/pharo/vm { };
|
||||
pharo = pharo-vms.multi-vm-wrapper;
|
||||
|
@ -14518,9 +14520,9 @@ with pkgs;
|
|||
|
||||
gnome-usage = callPackage ../applications/misc/gnome-usage {};
|
||||
|
||||
gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { };
|
||||
gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { };
|
||||
|
||||
gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { };
|
||||
gnome-latex = callPackage ../applications/editors/gnome-latex { };
|
||||
|
||||
gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { };
|
||||
|
||||
|
@ -14564,7 +14566,7 @@ with pkgs;
|
|||
gradle_4 = gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_9;
|
||||
gradle_7 = res.gradleGen.gradle_7;
|
||||
gradle_7 = res.gradleGen.gradle_7_3;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
|
@ -15532,7 +15534,7 @@ with pkgs;
|
|||
assimp = callPackage ../development/libraries/assimp { };
|
||||
|
||||
asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { };
|
||||
asio = callPackage ../development/libraries/asio/default.nix { };
|
||||
asio = callPackage ../development/libraries/asio { };
|
||||
|
||||
aspell = callPackage ../development/libraries/aspell { };
|
||||
|
||||
|
@ -16537,7 +16539,7 @@ with pkgs;
|
|||
then callPackage ../development/libraries/gnu-efi { }
|
||||
else null;
|
||||
|
||||
gnutls = callPackage ../development/libraries/gnutls/default.nix {
|
||||
gnutls = callPackage ../development/libraries/gnutls {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
util-linux = util-linuxMinimal; # break the cyclic dependency
|
||||
autoconf = buildPackages.autoconf269;
|
||||
|
@ -20128,7 +20130,7 @@ with pkgs;
|
|||
|
||||
cppzmq = callPackage ../development/libraries/cppzmq {};
|
||||
|
||||
czmq = callPackage ../development/libraries/czmq/default.nix {};
|
||||
czmq = callPackage ../development/libraries/czmq {};
|
||||
|
||||
zmqpp = callPackage ../development/libraries/zmqpp { };
|
||||
|
||||
|
@ -21764,6 +21766,8 @@ with pkgs;
|
|||
|
||||
fwupd = callPackage ../os-specific/linux/firmware/fwupd { };
|
||||
|
||||
fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { };
|
||||
|
||||
firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };
|
||||
|
||||
fwts = callPackage ../os-specific/linux/fwts { };
|
||||
|
@ -22147,7 +22151,7 @@ with pkgs;
|
|||
enableCmdlib = true;
|
||||
};
|
||||
|
||||
maddy = callPackage ../servers/maddy/default.nix { };
|
||||
maddy = callPackage ../servers/maddy { };
|
||||
|
||||
mbelib = callPackage ../development/libraries/audio/mbelib { };
|
||||
|
||||
|
@ -23807,6 +23811,8 @@ with pkgs;
|
|||
|
||||
apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {};
|
||||
|
||||
apkeep = callPackage ../tools/misc/apkeep { };
|
||||
|
||||
apngasm = callPackage ../applications/graphics/apngasm {};
|
||||
apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {};
|
||||
|
||||
|
@ -24028,7 +24034,7 @@ with pkgs;
|
|||
gtk = gtk3;
|
||||
};
|
||||
|
||||
bluej = callPackage ../applications/editors/bluej/default.nix {
|
||||
bluej = callPackage ../applications/editors/bluej {
|
||||
jdk = jetbrains.jdk;
|
||||
};
|
||||
|
||||
|
@ -24662,7 +24668,7 @@ with pkgs;
|
|||
|
||||
gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
|
||||
|
||||
greenfoot = callPackage ../applications/editors/greenfoot/default.nix {
|
||||
greenfoot = callPackage ../applications/editors/greenfoot {
|
||||
jdk = jetbrains.jdk;
|
||||
};
|
||||
|
||||
|
@ -24815,7 +24821,7 @@ with pkgs;
|
|||
|
||||
genxword = callPackage ../applications/misc/genxword { };
|
||||
|
||||
geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { };
|
||||
geoipupdate = callPackage ../applications/misc/geoipupdate { };
|
||||
|
||||
ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
|
||||
|
||||
|
@ -25307,7 +25313,7 @@ with pkgs;
|
|||
|
||||
linssid = libsForQt5.callPackage ../applications/networking/linssid { };
|
||||
|
||||
deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { };
|
||||
deadd-notification-center = callPackage ../applications/misc/deadd-notification-center { };
|
||||
|
||||
lollypop = callPackage ../applications/audio/lollypop { };
|
||||
|
||||
|
@ -25560,7 +25566,7 @@ with pkgs;
|
|||
|
||||
hpack = haskell.lib.justStaticExecutables haskellPackages.hpack;
|
||||
|
||||
hpcg = callPackage ../tools/misc/hpcg/default.nix { };
|
||||
hpcg = callPackage ../tools/misc/hpcg { };
|
||||
|
||||
hpl = callPackage ../tools/misc/hpl { };
|
||||
|
||||
|
@ -25633,7 +25639,7 @@ with pkgs;
|
|||
|
||||
pixelnuke = callPackage ../applications/graphics/pixelnuke { };
|
||||
|
||||
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap/default.nix { };
|
||||
pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { };
|
||||
|
||||
shepherd = nodePackages."@nerdwallet/shepherd";
|
||||
|
||||
|
@ -25763,11 +25769,11 @@ with pkgs;
|
|||
|
||||
workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
|
||||
|
||||
windowchef = callPackage ../applications/window-managers/windowchef/default.nix { };
|
||||
windowchef = callPackage ../applications/window-managers/windowchef { };
|
||||
|
||||
wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
|
||||
|
||||
wmfs = callPackage ../applications/window-managers/wmfs/default.nix { };
|
||||
wmfs = callPackage ../applications/window-managers/wmfs { };
|
||||
|
||||
i810switch = callPackage ../os-specific/linux/i810switch { };
|
||||
|
||||
|
@ -25873,7 +25879,7 @@ with pkgs;
|
|||
|
||||
img2pdf = with python3Packages; toPythonApplication img2pdf;
|
||||
|
||||
imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix {
|
||||
imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber {
|
||||
typescript = nodePackages.typescript;
|
||||
};
|
||||
|
||||
|
@ -26116,6 +26122,8 @@ with pkgs;
|
|||
|
||||
kube-score = callPackage ../applications/networking/cluster/kube-score { };
|
||||
|
||||
kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { };
|
||||
|
||||
kubeval = callPackage ../applications/networking/cluster/kubeval { };
|
||||
|
||||
kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
|
||||
|
@ -26629,7 +26637,7 @@ with pkgs;
|
|||
|
||||
mop = callPackage ../applications/misc/mop { };
|
||||
|
||||
mopidyPackages = callPackages ../applications/audio/mopidy/default.nix {
|
||||
mopidyPackages = callPackages ../applications/audio/mopidy {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
|
@ -27109,9 +27117,9 @@ with pkgs;
|
|||
|
||||
muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { };
|
||||
|
||||
nufraw = callPackage ../applications/graphics/nufraw/default.nix { };
|
||||
nufraw = callPackage ../applications/graphics/nufraw { };
|
||||
|
||||
nufraw-thumbnailer = callPackage ../applications/graphics/nufraw/default.nix {
|
||||
nufraw-thumbnailer = callPackage ../applications/graphics/nufraw {
|
||||
addThumbnailer = true;
|
||||
};
|
||||
|
||||
|
@ -28603,7 +28611,7 @@ with pkgs;
|
|||
|
||||
vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
|
||||
|
||||
vimv = callPackage ../tools/misc/vimv/default.nix { };
|
||||
vimv = callPackage ../tools/misc/vimv { };
|
||||
|
||||
qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
|
||||
|
||||
|
@ -29312,7 +29320,7 @@ with pkgs;
|
|||
inherit (gnome2) scrollkeeper libglade;
|
||||
};
|
||||
|
||||
xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {};
|
||||
xygrib = libsForQt514.callPackage ../applications/misc/xygrib {};
|
||||
|
||||
xzgv = callPackage ../applications/graphics/xzgv { };
|
||||
|
||||
|
@ -29789,7 +29797,7 @@ with pkgs;
|
|||
|
||||
crispyDoom = callPackage ../games/crispy-doom { };
|
||||
|
||||
vintagestory = callPackage ../games/vintagestory/default.nix { };
|
||||
vintagestory = callPackage ../games/vintagestory { };
|
||||
|
||||
cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
|
||||
cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
|
||||
|
@ -31084,7 +31092,7 @@ with pkgs;
|
|||
|
||||
snpeff = callPackage ../applications/science/biology/snpeff { };
|
||||
|
||||
somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { };
|
||||
somafm-cli = callPackage ../tools/misc/somafm-cli { };
|
||||
|
||||
somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { };
|
||||
|
||||
|
@ -32426,7 +32434,7 @@ with pkgs;
|
|||
nixosTesting.makeTest calledTest;
|
||||
|
||||
nixosOptionsDoc = attrs:
|
||||
(import ../../nixos/lib/make-options-doc/default.nix)
|
||||
(import ../../nixos/lib/make-options-doc)
|
||||
({ inherit pkgs lib; } // attrs);
|
||||
|
||||
nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { };
|
||||
|
@ -32742,8 +32750,8 @@ with pkgs;
|
|||
mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { };
|
||||
|
||||
# This driver is only available as a 32 bit proprietary binary driver
|
||||
mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).driver;
|
||||
mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).cupswrapper;
|
||||
mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver;
|
||||
mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper;
|
||||
|
||||
mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
|
||||
mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
|
||||
|
@ -32751,7 +32759,7 @@ with pkgs;
|
|||
mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { };
|
||||
mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { };
|
||||
|
||||
samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { };
|
||||
samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { };
|
||||
samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
|
||||
samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
|
||||
samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
|
||||
|
@ -33595,7 +33603,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit;
|
||||
};
|
||||
|
||||
cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { };
|
||||
cagebreak = callPackage ../applications/window-managers/cagebreak { };
|
||||
|
||||
psftools = callPackage ../os-specific/linux/psftools {};
|
||||
|
||||
|
|
|
@ -4633,7 +4633,7 @@ in {
|
|||
|
||||
mathlibtools = callPackage ../development/python-modules/mathlibtools { };
|
||||
|
||||
matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
|
||||
matplotlib = callPackage ../development/python-modules/matplotlib {
|
||||
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
@ -5305,7 +5305,7 @@ in {
|
|||
|
||||
openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };
|
||||
|
||||
openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { };
|
||||
openrouteservice = callPackage ../development/python-modules/openrouteservice { };
|
||||
|
||||
opensensemap-api = callPackage ../development/python-modules/opensensemap-api { };
|
||||
|
||||
|
@ -5516,7 +5516,7 @@ in {
|
|||
|
||||
pathvalidate = callPackage ../development/python-modules/pathvalidate { };
|
||||
|
||||
pathy = callPackage ../development/python-modules/pathy/default.nix { };
|
||||
pathy = callPackage ../development/python-modules/pathy { };
|
||||
|
||||
patiencediff = callPackage ../development/python-modules/patiencediff { };
|
||||
|
||||
|
@ -8545,7 +8545,7 @@ in {
|
|||
|
||||
signify = callPackage ../development/python-modules/signify { };
|
||||
|
||||
sip = callPackage ../development/python-modules/sip/default.nix { };
|
||||
sip = callPackage ../development/python-modules/sip { };
|
||||
|
||||
sip_4 = callPackage ../development/python-modules/sip/4.x.nix { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue