forked from mirrors/nixpkgs
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
42ec765901
|
|
@ -46,6 +46,7 @@ let
|
|||
showFiles
|
||||
showOption
|
||||
unknownModule
|
||||
literalExpression
|
||||
;
|
||||
|
||||
showDeclPrefix = loc: decl: prefix:
|
||||
|
|
@ -140,7 +141,7 @@ rec {
|
|||
# this module is used, to avoid conflicts and allow chaining of
|
||||
# extendModules.
|
||||
internalModule = rec {
|
||||
_file = ./modules.nix;
|
||||
_file = "lib/modules.nix";
|
||||
|
||||
key = _file;
|
||||
|
||||
|
|
@ -153,8 +154,91 @@ rec {
|
|||
# a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't
|
||||
# start a download when `pkgs` wasn't evaluated.
|
||||
type = types.lazyAttrsOf types.raw;
|
||||
internal = true;
|
||||
description = "Arguments passed to each module.";
|
||||
# Only render documentation once at the root of the option tree,
|
||||
# not for all individual submodules.
|
||||
internal = prefix != [];
|
||||
# TODO: Change the type of this option to a submodule with a
|
||||
# freeformType, so that individual arguments can be documented
|
||||
# separately
|
||||
description = ''
|
||||
Additional arguments passed to each module in addition to ones
|
||||
like <literal>lib</literal>, <literal>config</literal>,
|
||||
and <literal>pkgs</literal>, <literal>modulesPath</literal>.
|
||||
</para>
|
||||
<para>
|
||||
This option is also available to all submodules. Submodules do not
|
||||
inherit args from their parent module, nor do they provide args to
|
||||
their parent module or sibling submodules. The sole exception to
|
||||
this is the argument <literal>name</literal> which is provided by
|
||||
parent modules to a submodule and contains the attribute name
|
||||
the submodule is bound to, or a unique generated name if it is
|
||||
not bound to an attribute.
|
||||
</para>
|
||||
<para>
|
||||
Some arguments are already passed by default, of which the
|
||||
following <emphasis>cannot</emphasis> be changed with this option:
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<varname>lib</varname>: The nixpkgs library.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<varname>config</varname>: The results of all options after merging the values from all modules together.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<varname>options</varname>: The options declared in all modules.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<varname>specialArgs</varname>: The <literal>specialArgs</literal> argument passed to <literal>evalModules</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
All attributes of <varname>specialArgs</varname>
|
||||
</para>
|
||||
<para>
|
||||
Whereas option values can generally depend on other option values
|
||||
thanks to laziness, this does not apply to <literal>imports</literal>, which
|
||||
must be computed statically before anything else.
|
||||
</para>
|
||||
<para>
|
||||
For this reason, callers of the module system can provide <literal>specialArgs</literal>
|
||||
which are available during import resolution.
|
||||
</para>
|
||||
<para>
|
||||
For NixOS, <literal>specialArgs</literal> includes
|
||||
<varname>modulesPath</varname>, which allows you to import
|
||||
extra modules from the nixpkgs package tree without having to
|
||||
somehow make the module aware of the location of the
|
||||
<literal>nixpkgs</literal> or NixOS directories.
|
||||
<programlisting>
|
||||
{ modulesPath, ... }: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/minimal.nix")
|
||||
];
|
||||
}
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</para>
|
||||
<para>
|
||||
For NixOS, the default value for this option includes at least this argument:
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<varname>pkgs</varname>: The nixpkgs package set according to
|
||||
the <option>nixpkgs.pkgs</option> option.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
'';
|
||||
};
|
||||
|
||||
_module.check = mkOption {
|
||||
|
|
|
|||
|
|
@ -696,7 +696,7 @@ runTests {
|
|||
|
||||
locs = filter (o: ! o.internal) (optionAttrSetToDocList options);
|
||||
in map (o: o.loc) locs;
|
||||
expected = [ [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
|
||||
expected = [ [ "_module" "args" ] [ "foo" ] [ "foo" "<name>" "bar" ] [ "foo" "bar" ] ];
|
||||
};
|
||||
|
||||
testCartesianProductOfEmptySet = {
|
||||
|
|
|
|||
|
|
@ -8258,6 +8258,17 @@
|
|||
githubId = 1776903;
|
||||
name = "Andrew Abbott";
|
||||
};
|
||||
misterio77 = {
|
||||
email = "eu@misterio.me";
|
||||
github = "misterio77";
|
||||
githubId = 5727578;
|
||||
matrix = "@misterio:matrix.org";
|
||||
name = "Gabriel Fontes";
|
||||
keys = [{
|
||||
longkeyid = "rsa3072/0x245CAB70B4C225E9";
|
||||
fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9";
|
||||
}];
|
||||
};
|
||||
mitchmindtree = {
|
||||
email = "mail@mitchellnordine.com";
|
||||
github = "mitchmindtree";
|
||||
|
|
|
|||
|
|
@ -48,7 +48,9 @@ overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r')))
|
|||
|
||||
# fix up declaration paths in lazy options, since we don't eval them from a full nixpkgs dir
|
||||
for (k, v) in options.items():
|
||||
v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations']))
|
||||
# The _module options are not declared in nixos/modules
|
||||
if v.value['loc'][0] != "_module":
|
||||
v.value['declarations'] = list(map(lambda s: f'nixos/modules/{s}', v.value['declarations']))
|
||||
|
||||
# merge both descriptions
|
||||
for (k, v) in overrides.items():
|
||||
|
|
|
|||
|
|
@ -7,19 +7,26 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.qtile.enable = mkEnableOption "qtile";
|
||||
options.services.xserver.windowManager.qtile = {
|
||||
enable = mkEnableOption "qtile";
|
||||
|
||||
package = mkPackageOption pkgs "qtile" { };
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = [{
|
||||
name = "qtile";
|
||||
start = ''
|
||||
${pkgs.qtile}/bin/qtile start &
|
||||
${cfg.package}/bin/qtile start &
|
||||
waitPID=$!
|
||||
'';
|
||||
}];
|
||||
|
||||
environment.systemPackages = [ pkgs.qtile ];
|
||||
environment.systemPackages = [
|
||||
# pkgs.qtile is currently a buildenv of qtile and its dependencies.
|
||||
# For userland commands, we want the underlying package so that
|
||||
# packages such as python don't bleed into userland and overwrite intended behavior.
|
||||
(cfg.package.unwrapped or cfg.package)
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,13 +26,13 @@ let
|
|||
};
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "pytrainer";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytrainer";
|
||||
repo = "pytrainer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i3QC6ct7tS8B0QQjtVqPcd03LLIxo6djQe4YX35syzk=";
|
||||
sha256 = "sha256-U2SVQKkr5HF7LB0WuCZ1xc7TljISjCNO26QUDGR+W/4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "100.0.4896.60",
|
||||
"sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf",
|
||||
"sha256bin64": "07wavs9r6ilwx5rzyqvydcjskg6sml5b8m6mw7qzykvhs8bnvfh5",
|
||||
"version": "100.0.4896.75",
|
||||
"sha256": "1h60l1g340gvm4lz2lps6dqpvahpzn24hz47y2qvc6mavx9d6ki4",
|
||||
"sha256bin64": "0nrrkgwcnqg4l8x1nk1rdxnv9xa0c24ync1yls7s9rc34wkk8sc5",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-21",
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "100.0.4896.20",
|
||||
"sha256_linux": "1d3g43s5adn1vs7iv5ccp0f376qvnvf67mhid7kxkysnqv55bxdw",
|
||||
"sha256_darwin": "129vw1ablb6xyr7j30zxkh7n835wi82ksd8c5m11mmdnrmrcdabv",
|
||||
"sha256_darwin_aarch64": "0zgnisvdvcc726q22jn1cyfg41zz1af5l3fy3m81jlfhph2ibbra"
|
||||
"version": "100.0.4896.60",
|
||||
"sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31",
|
||||
"sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9",
|
||||
"sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -7,10 +7,10 @@ in
|
|||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
version = "98.0.2";
|
||||
version = "99.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e";
|
||||
sha512 = "08f6d5a668140c4275aba6df463ed3af596043dfe5f27573583afbc1e9f6b27ebca79a52ce2c9598261c631b400b5378744e9e70f51ef9c4098b419e9904aa7c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -32,10 +32,10 @@ rec {
|
|||
|
||||
firefox-esr-91 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.7.1esr";
|
||||
version = "91.8.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c";
|
||||
sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lagrange";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RrdD+G8DKOBm0TpmRQg1uMGNFAlAADFeK3h6oyo5RZ4=";
|
||||
sha256 = "sha256-1eWd4En14p8E04kLWbsbJSEdjManQ87N/P3klFbUQx4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, copyDesktopItems
|
||||
, electron_14
|
||||
, electron_16
|
||||
, esbuild
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
|
|
@ -33,9 +33,9 @@ let
|
|||
};
|
||||
});
|
||||
electronExec = if stdenv.isDarwin then
|
||||
"${electron_14}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
"${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
|
||||
else
|
||||
"${electron_14}/bin/electron";
|
||||
"${electron_16}/bin/electron";
|
||||
esbuild' = esbuild.overrideAttrs (old: rec {
|
||||
version = "0.12.29";
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -47,13 +47,13 @@ let
|
|||
});
|
||||
in nodejs-14_x.pkgs.deltachat-desktop.override rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.28.0";
|
||||
version = "1.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ur0UxaKEWp+y7lGz2Khsg4npOf+gjCiOoijkSbnp0hg=";
|
||||
hash = "sha256-i2Cb2HfapYTaxg5IUl4pGWYUM6o/4mWgMO7QsBqDHoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "deltachat-desktop",
|
||||
"version": "1.28.0",
|
||||
"version": "1.28.1",
|
||||
"dependencies": {
|
||||
"@blueprintjs/core": "^3.22.3",
|
||||
"@deltachat/message_parser_wasm": "^0.3.0",
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nextdns";
|
||||
version = "1.37.10";
|
||||
version = "1.37.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextdns";
|
||||
repo = "nextdns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo=";
|
||||
sha256 = "sha256-BOmu4OjDq1IwsPjbqzV2OtvKpaYFqP/XdYL2Ug28TbU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I=";
|
||||
vendorSha256 = "sha256-M2PlvUsEG3Um+NqbpHdtu9g+Gj6jSXZ9YZ7t1MwjjdI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-+zW/tRZ6QhIfWae5t6wNdbvQUXua/W2Rgx6E01c13fg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix path to libeog.so in the gir file.
|
||||
# We patch gobject-introspection to hardcode absolute paths but
|
||||
# our Meson patch will only pass the info when install_dir is absolute as well.
|
||||
./fix-gir-lib-path.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
|
|||
13
pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch
Normal file
13
pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/meson.build b/src/meson.build
|
||||
index cc9d3856..f909836d 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -165,7 +165,7 @@ libeog = shared_library(
|
||||
link_args: ldflags,
|
||||
link_depends: symbol_map,
|
||||
install: true,
|
||||
- install_dir: eog_pkglibdir,
|
||||
+ install_dir: eog_prefix / eog_pkglibdir,
|
||||
)
|
||||
|
||||
libeog_dep = declare_dependency(
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-arcmenu";
|
||||
version = "24";
|
||||
version = "27";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arcmenu";
|
||||
repo = "ArcMenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GbZt6JC+uAPkb4GU1Q7WRJ6Pf95Uh48cYwvoTgLimHs=";
|
||||
sha256 = "sha256-X5oA475Wl3SKVLLcg47Hv91VV8HGeNHhaQLfNi3xt8k=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,20 +1,19 @@
|
|||
{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }:
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-system-monitor";
|
||||
version = "unstable-2021-09-07";
|
||||
version = "unstable-2022-02-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradoxxxzero";
|
||||
repo = "gnome-shell-system-monitor-applet";
|
||||
rev = "133f9f32bca5d159515d709bbdee81bf497ebdc5";
|
||||
sha256 = "1vz1s1x22xmmzaayrzv5jyzlmxslhfaybbnv959szvfp4mdrhch9";
|
||||
rev = "2c6eb0a447bfc9f1a07c61956c92a55c874baf16";
|
||||
hash = "sha256-JuRRlvqlqneqUdgezKGl2yg7wFYGCCo51q9CBwrxTBY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
glib-networking
|
||||
libgtop
|
||||
gnome.gnome-shell
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -24,25 +23,13 @@ stdenv.mkDerivation rec {
|
|||
gtop_path = "${libgtop}/lib/girepository-1.0";
|
||||
glib_net_path = "${glib-networking}/lib/girepository-1.0";
|
||||
})
|
||||
# Support GNOME 41
|
||||
(fetchpatch {
|
||||
url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/718/commits/f4ebc29afa707326b977230329e634db169f55b1.patch";
|
||||
sha256 = "0ndnla41mvrww6ldf9d55ar1ibyj8ak5pp1dkjg75jii9slgzjqb";
|
||||
})
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
glib-compile-schemas --targetdir="system-monitor@paradoxxx.zero.gmail.com/schemas" "system-monitor@paradoxxx.zero.gmail.com/schemas"
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/share/gnome-shell/extensions
|
||||
cp -r "system-monitor@paradoxxx.zero.gmail.com" $out/share/gnome-shell/extensions
|
||||
runHook postInstall
|
||||
'';
|
||||
makeFlags = [
|
||||
"VERSION=${version}"
|
||||
"INSTALLBASE=$(out)/share/gnome-shell/extensions"
|
||||
"SUDO="
|
||||
];
|
||||
|
||||
passthru = {
|
||||
extensionUuid = "system-monitor@paradoxxx.zero.gmail.com";
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openmpi";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
|
||||
src = with lib.versions; fetchurl {
|
||||
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
|
||||
sha256 = "09xmlr4mfs02kwcf5cmdgkcdjj81fjwjmpa3rz2k28f3gz7wfy4v";
|
||||
sha256 = "sha256-PYHQTFTvtV04caRl/7CY2NcsH0j/HLryWA6wWFZ8Cjs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
4995
pkgs/development/node-packages/node-packages.nix
generated
4995
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioguardian";
|
||||
version = "2022.03.1";
|
||||
version = "2022.03.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-UiRTyUAoTcohRkTBF5Jvd/uY2zAbHV5z4HC8Oc0QNTs=";
|
||||
sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "anybadge";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jongracecox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xKHIoV/8qsNMcU5fd92Jjh7d7jTeYN5xakMEjR6qPX8=";
|
||||
sha256 = "sha256-9C1oPZcXjrGwvkx20E+xPGje+ATD9HwOCWWn/pg+98Q=";
|
||||
};
|
||||
|
||||
# setup.py reads its version from the TRAVIS_TAG environment variable
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.13.7";
|
||||
version = "0.13.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FCmdYuXh8+nWfeGbJ9IhfwASFsZoxOp7jL+5/TrtG5Q=";
|
||||
hash = "sha256-n1ckAHU31Lo/CdhKxa4sOWuNLg565BB0XKcmpZovCMs=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.33";
|
||||
version = "0.3.37";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY=";
|
||||
hash = "sha256-+Wr/JF9es2LQhQ5rc0iyGZa0Di5CsFo9k36WI7jrOqs=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
|
|||
|
|
@ -14,12 +14,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chiavdf";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0=";
|
||||
hash = "sha256-Ri7j/T0nnZFml4kC0qIQkyYRJBPZMhTYxolW/A25030=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dunamai";
|
||||
version = "1.10.0";
|
||||
version = "1.11.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "mtkennerly";
|
||||
repo = "dunamai";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI=";
|
||||
sha256 = "sha256-nkE9QBziCQA/aN+Z0OuqJlf5FJ4fidE7u5Gt25zjX0c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,15 +8,19 @@
|
|||
, proto-plus
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-secret-manager";
|
||||
version = "2.9.2";
|
||||
version = "2.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-W93SDJR8bUPQX9KzoZ6YvV9kU+Twd9huH09Smap481g=";
|
||||
hash = "sha256-nQfdej2SveO0Qxam57ZRAyTQ0NnGoyb4nx2YFnqtAhI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
{ buildPythonPackage, fetchPypi, lib }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "teletype";
|
||||
version = "1.3.2";
|
||||
version = "1.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-9q46a4ui2kgSUL/vImR02r4T9huwLFwd70AqGBNJNzs=";
|
||||
hash = "sha256-uBppM4w9GlMgYqKFGw1Rcjvq+mnU04K3E74jCgK9YYo=";
|
||||
};
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "teletype" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"teletype"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-level cross platform tty library";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pack";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildpacks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nlSJwo2YjbOOKofZwXdWB3fxRUNTeSUcT6jN987SB3o=";
|
||||
sha256 = "sha256-zwvZ99SLeYQDSzrEy2eYPMyFh9B6LWZT3tY92EOrXnU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4uMd0KaV5xrxuJ9yqpxbD3YTNaBHsH2d/IRtYRyN5+0=";
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
# rev is the commit of the tag, mainly for kustomize version command output
|
||||
rev = "b2d65ddc98e09187a8e38adc27c30bab078c1dbf";
|
||||
rev = "cf3a452ddd6f83945d39d582243b8592ec627ae3";
|
||||
|
||||
ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
|
||||
[
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
owner = "kubernetes-sigs";
|
||||
repo = pname;
|
||||
rev = "kustomize/v${version}";
|
||||
sha256 = "sha256-sy429uTTYvjnweZlsuolBamcggRXmaR8uxD043GUIQE=";
|
||||
sha256 = "sha256-7Ode+ONgWJRNSbIpvIjhuT+oVvZgJfByFqS/iSUhcXw=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
@ -25,7 +25,7 @@ buildGoModule rec {
|
|||
# avoid finding test and development commands
|
||||
sourceRoot = "source/kustomize";
|
||||
|
||||
vendorSha256 = "sha256-5kMMSr+YyuoASgW+qzkyO4CcDHFFANcsAZTUqHX5nGk=";
|
||||
vendorSha256 = "sha256-beIbeY/+k2NgotGw5zQFkYuqMKlwctoxuToZfiFlCm4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Customization of kubernetes YAML configurations";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub, unstableGitUpdater }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "patchelf";
|
||||
version = "2021-11-16";
|
||||
version = "unstable-2022-02-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "patchelf";
|
||||
rev = "a174cf3006baf31e0e9eaa62bc9adead93af63f7";
|
||||
sha256 = "sha256-cKZ4DE70R5XiIqfnIVAl2s7a1bJxaaPpuCmxs3pxFRU=";
|
||||
rev = "a35054504293f9ff64539850d1ed0bfd2f5399f2";
|
||||
sha256 = "sha256-/hD/abmzWSkDhAWPLHiLQQ9cwJF8oFDuovNzRqs3Bho=";
|
||||
};
|
||||
|
||||
# Drop test that fails on musl (?)
|
||||
|
|
@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater {
|
||||
url = "https://github.com/NixOS/patchelf.git";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NixOS/patchelf";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "utop";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildDunePackage rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz";
|
||||
sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd";
|
||||
sha256 = "sha256-6TQxLYN/qjTABZuK6rp+daCSNWyJIXzB8q2QpZeBwaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper cppo ];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "12.22.11";
|
||||
sha256 = "sha256-XoHaJv1bH4lxRIOrqmjj2jBFI+QzTHjEm/p6A+541vE=";
|
||||
version = "12.22.12";
|
||||
sha256 = "1whl0zi6fs9ay33bhcn2kh9xynran05iipahg1zzr6sv97wbfhmw";
|
||||
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, SDL2, IOKit, Foundation, cmake, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bugdom";
|
||||
|
|
@ -12,8 +12,18 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# Expects SDL2.framework in specific location, which we don't have
|
||||
# Passing this in cmakeFlags doesn't work because the path is hard-coded for Darwin
|
||||
substituteInPlace cmake/FindSDL2.cmake \
|
||||
--replace 'set(SDL2_LIBRARIES' 'set(SDL2_LIBRARIES "${SDL2}/lib/libSDL2.dylib") #'
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
IOKit
|
||||
Foundation
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -21,13 +31,25 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}"
|
||||
# Expects SDL2.framework in specific location, which we don't have
|
||||
"-DSDL2_INCLUDE_DIRS=${SDL2.dev}/include/SDL2"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
'' + (if stdenv.hostPlatform.isDarwin then ''
|
||||
mkdir -p $out/{bin,Applications}
|
||||
mv {,$out/Applications/}Bugdom.app
|
||||
ln -s $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom
|
||||
'' else ''
|
||||
mkdir -p $out/share/bugdom
|
||||
mv Data $out/share/bugdom
|
||||
install -Dm755 {.,$out/bin}/Bugdom
|
||||
wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom"
|
||||
'') + ''
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
@ -39,6 +61,6 @@ stdenv.mkDerivation rec {
|
|||
cc-by-sa-40
|
||||
];
|
||||
maintainers = with maintainers; [ lux ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
48
pkgs/misc/drivers/argononed/default.nix
Normal file
48
pkgs/misc/drivers/argononed/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitLab, dtc, installShellFiles }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "argononed";
|
||||
version = "unstable-2022-03-26";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "DarkElvenAngel";
|
||||
repo = pname;
|
||||
rev = "97c4fa07fc2c09ffc3bd86e0f6319d50fa639578";
|
||||
sha256 = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-hardcoded-reboot-poweroff-paths.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs configure
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildInputs = [ dtc ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 build/argononed $out/bin/argononed
|
||||
install -Dm755 build/argonone-cli $out/bin/argonone-cli
|
||||
install -Dm755 build/argonone-shutdown $out/lib/systemd/system-shutdown/argonone-shutdown
|
||||
install -Dm644 build/argonone.dtbo $out/boot/overlays/argonone.dtbo
|
||||
|
||||
install -Dm644 OS/_common/argononed.service $out/lib/systemd/system/argononed.service
|
||||
install -Dm644 OS/_common/argononed.logrotate $out/etc/logrotate.d/argononed
|
||||
install -Dm644 LICENSE $out/share/argononed/LICENSE
|
||||
|
||||
installShellCompletion --bash --name argonone-cli OS/_common/argonone-cli-complete.bash
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/DarkElvenAngel/argononed";
|
||||
description = "A replacement daemon for the Argon One Raspberry Pi case";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.misterio77 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
--- a/src/argononed.c
|
||||
+++ b/src/argononed.c
|
||||
@@ -783,13 +783,13 @@
|
||||
{
|
||||
log_message(LOG_DEBUG, "EXEC REBOOT");
|
||||
sync();
|
||||
- system("/sbin/reboot");
|
||||
+ system("/run/current-system/sw/bin/reboot");
|
||||
}
|
||||
if (count >= 39 && count <= 41)
|
||||
{
|
||||
log_message(LOG_DEBUG, "EXEC SHUTDOWN");
|
||||
sync();
|
||||
- system("/sbin/poweroff");
|
||||
+ system("/run/current-system/sw/bin/poweroff");
|
||||
}
|
||||
#else
|
||||
log_message(LOG_INFO,"Daemon Ready");
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.14";
|
||||
version = "1.6.15";
|
||||
pname = "memcached";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-VNY3QsaIbc3E4Mh/RDmikwqHbNnyv6AdaZsMa60XB7M=";
|
||||
sha256 = "sha256-jXq+PWSTeO27oW9C7x1myj8qwHXy65cUXOFkOI5u1RU=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-DVmszzDre0pWXARUqXuqGfY3pX1Ijh33G0Gsdmp8f98=";
|
||||
sha256 = "sha256-OaKgX3qwiJM/EPprV1r3CbUnxOaWl7BTMcS5v+tmHoo=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildFishPlugin rec {
|
||||
pname = "fzf.fish";
|
||||
version = "8.1";
|
||||
version = "8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PatrickF1";
|
||||
repo = "fzf.fish";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uqYVbRdrcO6StaIim9S8xmb9P67CmXnLEywSeILn4yQ=";
|
||||
sha256 = "sha256-WRrPd/GuXHJ9uYvhwjwp9AEtvbfMlpV0xdgNyfx43ok=";
|
||||
};
|
||||
|
||||
checkInputs = [ fzf fd util-linux ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "spotdl";
|
||||
version = "3.9.3";
|
||||
version = "3.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spotDL";
|
||||
repo = "spotify-downloader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sx6UtblpsetKPwhlXB3Kj3OMIOyW9QluzB+YbtQGdYQ=";
|
||||
sha256 = "sha256-PJ9m+697bdrhHZ80wJvL6V366Vn3tmPfioK1sZAyB/Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2022.2";
|
||||
version = "1.2022.3";
|
||||
pname = "plantuml";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
|
||||
sha256 = "sha256-4LPR8gdpfebq5U/umxcFfqe7i6qJHLqhOAu7DfYzTY8=";
|
||||
sha256 = "sha256-u40P3YFiWd419Bz1NvhIsPa7nASl/I9z/L2Q5v9eOAo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "svtplay-dl";
|
||||
version = "4.10";
|
||||
version = "4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "sha256-JK/JtGDmmTJ+g0kmM7mSJi7+/N552GKtlMkh7quOBjo=";
|
||||
sha256 = "1ybip45bfmvajw046v6mxjbf3vv0y7zgfb454rjy56zhx40l232v";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
|
|
|||
|
|
@ -1,26 +1,16 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nethogs";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raboof";
|
||||
repo = "nethogs";
|
||||
rev = "v${version}";
|
||||
sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9";
|
||||
sha256 = "10shdwvfj90lp2fxz9260342a1c2n1jbw058qy5pyq5kh3xwr9b8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pull upstream patch for ncurses-6.3 support:
|
||||
# https://github.com/raboof/nethogs/pull/210
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch";
|
||||
sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ ncurses libpcap ];
|
||||
|
||||
makeFlags = [ "VERSION=${version}" "nethogs" ];
|
||||
|
|
|
|||
|
|
@ -11,13 +11,6 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
changeVersionHash = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {
|
||||
inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version hash;
|
||||
};
|
||||
});
|
||||
|
||||
localPython = python3.override
|
||||
{
|
||||
self = localPython;
|
||||
|
|
@ -26,7 +19,15 @@ let
|
|||
botocore = changeVersion super.botocore.overridePythonAttrs "1.23.54" "sha256-S7m6FszO5fWiYCBJvD4ttoZTRrJVBmfzATvfM7CgHOs=";
|
||||
colorama = changeVersion super.colorama.overridePythonAttrs "0.4.3" "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9";
|
||||
future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
|
||||
requests = changeVersionHash super.requests.overridePythonAttrs "2.26.0" "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c=";
|
||||
requests = super.requests.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.26.0";
|
||||
checkInputs = oldAttrs.checkInputs ++ [ super.trustme ];
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
hash = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c=";
|
||||
};
|
||||
}
|
||||
);
|
||||
six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3";
|
||||
wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf";
|
||||
semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54";
|
||||
|
|
|
|||
|
|
@ -31003,7 +31003,9 @@ with pkgs;
|
|||
|
||||
btanks = callPackage ../games/btanks { };
|
||||
|
||||
bugdom = callPackage ../games/bugdom { };
|
||||
bugdom = callPackage ../games/bugdom {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Foundation;
|
||||
};
|
||||
|
||||
bzflag = callPackage ../games/bzflag {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
|
||||
|
|
@ -33190,6 +33192,8 @@ with pkgs;
|
|||
swt = swt_jdk8;
|
||||
};
|
||||
|
||||
argononed = callPackage ../misc/drivers/argononed { };
|
||||
|
||||
attract-mode = callPackage ../applications/emulators/attract-mode { };
|
||||
|
||||
autotiling = python3Packages.callPackage ../misc/autotiling { };
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
, python
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
self:
|
||||
|
||||
let
|
||||
|
|
@ -40,12 +38,12 @@ let
|
|||
}
|
||||
else ff;
|
||||
|
||||
buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
|
||||
buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
|
||||
inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}"
|
||||
inherit toPythonModule; # Libraries provide modules
|
||||
}));
|
||||
|
||||
buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
|
||||
buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage ../development/interpreters/python/mk-python-derivation.nix {
|
||||
namePrefix = ""; # Python applications should not have any prefix
|
||||
toPythonModule = x: x; # Application does not provide modules.
|
||||
}));
|
||||
|
|
@ -60,15 +58,14 @@ let
|
|||
|
||||
# Get list of required Python modules given a list of derivations.
|
||||
requiredPythonModules = drvs: let
|
||||
modules = filter hasPythonModule drvs;
|
||||
in unique ([python] ++ modules ++ concatLists (catAttrs "requiredPythonModules" modules));
|
||||
modules = lib.filter hasPythonModule drvs;
|
||||
in lib.unique ([python] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPythonModules" modules));
|
||||
|
||||
# Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations
|
||||
# providing Python modules.
|
||||
makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs);
|
||||
|
||||
removePythonPrefix = name:
|
||||
removePrefix namePrefix name;
|
||||
removePythonPrefix = lib.removePrefix namePrefix;
|
||||
|
||||
# Convert derivation to a Python module.
|
||||
toPythonModule = drv:
|
||||
|
|
@ -1889,7 +1886,7 @@ in {
|
|||
coveralls = callPackage ../development/python-modules/coveralls { };
|
||||
|
||||
cppe = callPackage ../development/python-modules/cppe {
|
||||
cppe = pkgs.cppe;
|
||||
inherit (pkgs) cppe;
|
||||
};
|
||||
|
||||
cppheaderparser = callPackage ../development/python-modules/cppheaderparser { };
|
||||
|
|
@ -3636,7 +3633,7 @@ in {
|
|||
|
||||
gst-python = callPackage ../development/python-modules/gst-python {
|
||||
inherit (pkgs) meson;
|
||||
gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;
|
||||
inherit (pkgs.gst_all_1) gst-plugins-base;
|
||||
};
|
||||
|
||||
gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { };
|
||||
|
|
@ -4656,7 +4653,7 @@ in {
|
|||
});
|
||||
|
||||
libgpuarray = callPackage ../development/python-modules/libgpuarray {
|
||||
clblas = pkgs.clblas.override { boost = self.boost; };
|
||||
clblas = pkgs.clblas.override { inherit (self) boost; };
|
||||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
};
|
||||
|
||||
|
|
@ -4670,7 +4667,7 @@ in {
|
|||
inherit (pkgs) lzfse;
|
||||
};
|
||||
|
||||
libmodulemd = pipe pkgs.libmodulemd [
|
||||
libmodulemd = lib.pipe pkgs.libmodulemd [
|
||||
toPythonModule
|
||||
(p:
|
||||
p.overrideAttrs (super: {
|
||||
|
|
@ -4695,7 +4692,7 @@ in {
|
|||
|
||||
libpyvivotek = callPackage ../development/python-modules/libpyvivotek { };
|
||||
|
||||
libpwquality = pipe pkgs.libpwquality [
|
||||
libpwquality = lib.pipe pkgs.libpwquality [
|
||||
toPythonModule
|
||||
(p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; }))
|
||||
(p: p.override { enablePython = true; inherit python; })
|
||||
|
|
@ -4707,7 +4704,7 @@ in {
|
|||
inherit (self) python libxml2;
|
||||
});
|
||||
|
||||
librepo = pipe pkgs.librepo [
|
||||
librepo = lib.pipe pkgs.librepo [
|
||||
toPythonModule
|
||||
(p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; }))
|
||||
(p: p.override { inherit python; })
|
||||
|
|
@ -4718,13 +4715,13 @@ in {
|
|||
|
||||
librouteros = callPackage ../development/python-modules/librouteros { };
|
||||
|
||||
libsass = (callPackage ../development/python-modules/libsass {
|
||||
libsass = callPackage ../development/python-modules/libsass {
|
||||
inherit (pkgs) libsass;
|
||||
});
|
||||
};
|
||||
|
||||
libsavitar = callPackage ../development/python-modules/libsavitar { };
|
||||
|
||||
libselinux = pipe pkgs.libselinux [
|
||||
libselinux = lib.pipe pkgs.libselinux [
|
||||
toPythonModule
|
||||
(p:
|
||||
p.overrideAttrs (super: {
|
||||
|
|
@ -5254,10 +5251,10 @@ in {
|
|||
|
||||
monkeyhex = callPackage ../development/python-modules/monkeyhex { };
|
||||
|
||||
monosat = (pkgs.monosat.python {
|
||||
monosat = pkgs.monosat.python {
|
||||
inherit buildPythonPackage;
|
||||
inherit (self) cython;
|
||||
});
|
||||
};
|
||||
|
||||
monotonic = callPackage ../development/python-modules/monotonic { };
|
||||
|
||||
|
|
@ -5787,7 +5784,7 @@ in {
|
|||
openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { };
|
||||
|
||||
openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings {
|
||||
openbabel = (callPackage ../development/libraries/openbabel { python = self.python; });
|
||||
openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; };
|
||||
};
|
||||
|
||||
opencv3 = toPythonModule (pkgs.opencv3.override {
|
||||
|
|
@ -6869,7 +6866,7 @@ in {
|
|||
pyctr = callPackage ../development/python-modules/pyctr { };
|
||||
|
||||
pycuda = callPackage ../development/python-modules/pycuda {
|
||||
cudatoolkit = pkgs.cudatoolkit;
|
||||
inherit (pkgs) cudatoolkit;
|
||||
inherit (pkgs.stdenv) mkDerivation;
|
||||
};
|
||||
|
||||
|
|
@ -9410,12 +9407,12 @@ in {
|
|||
snuggs = callPackage ../development/python-modules/snuggs { };
|
||||
|
||||
soapysdr = toPythonModule (pkgs.soapysdr.override {
|
||||
python = self.python;
|
||||
inherit (self) python;
|
||||
usePython = true;
|
||||
});
|
||||
|
||||
soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override {
|
||||
python = self.python;
|
||||
inherit (self) python;
|
||||
usePython = true;
|
||||
});
|
||||
|
||||
|
|
@ -10040,9 +10037,9 @@ in {
|
|||
|
||||
thumborPexif = callPackage ../development/python-modules/thumborpexif { };
|
||||
|
||||
tkinter = let
|
||||
tkinter = callPackage ../development/python-modules/tkinter {
|
||||
py = python.override { x11Support=true; };
|
||||
in callPackage ../development/python-modules/tkinter { py = py; };
|
||||
};
|
||||
|
||||
tidylib = callPackage ../development/python-modules/pytidylib { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue