mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5f94099928
@ -126,11 +126,37 @@ let
|
||||
}
|
||||
'';
|
||||
|
||||
singleMDDoc = name: value: ''
|
||||
## ${lib.escape [ "<" ">" ] name}
|
||||
${value.description}
|
||||
|
||||
${lib.optionalString (value ? type) ''
|
||||
*_Type_*:
|
||||
${value.type}
|
||||
''}
|
||||
|
||||
${lib.optionalString (value ? default) ''
|
||||
*_Default_*
|
||||
```
|
||||
${builtins.toJSON value.default}
|
||||
```
|
||||
''}
|
||||
|
||||
${lib.optionalString (value ? example) ''
|
||||
*_Example_*
|
||||
```
|
||||
${builtins.toJSON value.example}
|
||||
```
|
||||
''}
|
||||
'';
|
||||
|
||||
in {
|
||||
inherit optionsNix;
|
||||
|
||||
optionsAsciiDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleAsciiDoc optionsNix);
|
||||
|
||||
optionsMDDoc = lib.concatStringsSep "\n" (lib.mapAttrsToList singleMDDoc optionsNix);
|
||||
|
||||
optionsJSON = pkgs.runCommand "options.json"
|
||||
{ meta.description = "List of NixOS options in JSON format";
|
||||
buildInputs = [ pkgs.brotli ];
|
||||
|
||||
@ -5,17 +5,16 @@ with lib;
|
||||
let
|
||||
cfg = config.services.getty;
|
||||
|
||||
loginArgs = [
|
||||
baseArgs = [
|
||||
"--login-program" "${pkgs.shadow}/bin/login"
|
||||
] ++ optionals (cfg.autologinUser != null) [
|
||||
"--autologin" cfg.autologinUser
|
||||
] ++ optionals (cfg.loginOptions != null) [
|
||||
"--login-options" cfg.loginOptions
|
||||
];
|
||||
] ++ cfg.extraArgs;
|
||||
|
||||
gettyCmd = extraArgs:
|
||||
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs loginArgs} "
|
||||
+ extraArgs;
|
||||
gettyCmd = args:
|
||||
"@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs baseArgs} ${args}";
|
||||
|
||||
in
|
||||
|
||||
@ -54,7 +53,16 @@ in
|
||||
will not be invoked with a <option>--login-options</option>
|
||||
option.
|
||||
'';
|
||||
example = "-h darkstar -- \u";
|
||||
example = "-h darkstar -- \\u";
|
||||
};
|
||||
|
||||
extraArgs = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
description = ''
|
||||
Additional arguments passed to agetty.
|
||||
'';
|
||||
example = [ "--nohostname" ];
|
||||
};
|
||||
|
||||
greetingLine = mkOption {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ system ? builtins.currentSystem
|
||||
, config ? { }
|
||||
, pkgs ? import ../.. { inherit system config; }
|
||||
}:
|
||||
}@args:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
assert "Linux" in machine.succeed("uname -s")
|
||||
assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
|
||||
'';
|
||||
}));
|
||||
}) args);
|
||||
in
|
||||
with pkgs; {
|
||||
linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;
|
||||
|
||||
70
pkgs/applications/audio/CHOWTapeModel/default.nix
Normal file
70
pkgs/applications/audio/CHOWTapeModel/default.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ alsaLib
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, freetype
|
||||
, libGL
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libjack2
|
||||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CHOWTapeModel";
|
||||
version = "unstable-2020-12-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jatinchowdhury18";
|
||||
repo = "AnalogTapeModel";
|
||||
rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70";
|
||||
sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
curl
|
||||
freeglut
|
||||
freetype
|
||||
libGL
|
||||
libXcursor
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libjack2
|
||||
python3
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
cd Plugin/
|
||||
./build_linux.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/
|
||||
cd Builds/LinuxMakefile/build/
|
||||
cp CHOWTapeModel.a $out/lib
|
||||
cp -r CHOWTapeModel.lv2 $out/lib/lv2
|
||||
cp -r CHOWTapeModel.vst3 $out/lib/vst3
|
||||
cp CHOWTapeModel $out/bin
|
||||
cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel";
|
||||
description = "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bchoppr";
|
||||
version = "1.10.4";
|
||||
version = "1.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/csds8QOgn5IogyMg/5PMKdlCISakS3GDkyj2tTt0BY=";
|
||||
sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BSEQuencer";
|
||||
version = "1.8.6";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-PZ2Ft7y2mbb5Wpa7mWPys2BVpcQC3WE5rKu2sRqkf8w=";
|
||||
sha256 = "sha256-OArIMf0XP9CKDdb3H4s8jMzVRjoLFQDPmTS9rS2KW3w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BShapr";
|
||||
version = "0.10";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oEBsaIcw/Ltxr2CUPGBjwcxOPhNQoYPZDkfQE7QA940=";
|
||||
sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BSlizr";
|
||||
version = "1.2.10";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tEGJrVg8dN9Torybx02qIpXsGOuCgn/Wb+jemfCjiK4=";
|
||||
sha256 = "sha256-vPkcgG+pAfjsPRMyxdMRUxWGch+RG+pdaAcekP5pKEA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,46 +1,39 @@
|
||||
{ newScope, python }:
|
||||
{ lib, newScope, python }:
|
||||
|
||||
# Create a custom scope so we are consistent in which python version is used
|
||||
lib.makeScope newScope (self: with self; {
|
||||
inherit python;
|
||||
pythonPackages = python.pkgs;
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
mopidy = callPackage ./mopidy.nix { };
|
||||
|
||||
self = {
|
||||
mopidy-iris = callPackage ./iris.nix { };
|
||||
|
||||
inherit python;
|
||||
pythonPackages = python.pkgs;
|
||||
mopidy-local = callPackage ./local.nix { };
|
||||
|
||||
mopidy = callPackage ./mopidy.nix { };
|
||||
mopidy-moped = callPackage ./moped.nix { };
|
||||
|
||||
mopidy-iris = callPackage ./iris.nix { };
|
||||
mopidy-mopify = callPackage ./mopify.nix { };
|
||||
|
||||
mopidy-local = callPackage ./local.nix { };
|
||||
mopidy-mpd = callPackage ./mpd.nix { };
|
||||
|
||||
mopidy-moped = callPackage ./moped.nix { };
|
||||
mopidy-mpris = callPackage ./mpris.nix { };
|
||||
|
||||
mopidy-mopify = callPackage ./mopify.nix { };
|
||||
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
|
||||
|
||||
mopidy-mpd = callPackage ./mpd.nix { };
|
||||
mopidy-scrobbler = callPackage ./scrobbler.nix { };
|
||||
|
||||
mopidy-mpris = callPackage ./mpris.nix { };
|
||||
mopidy-somafm = callPackage ./somafm.nix { };
|
||||
|
||||
mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { };
|
||||
mopidy-soundcloud = callPackage ./soundcloud.nix { };
|
||||
|
||||
mopidy-scrobbler = callPackage ./scrobbler.nix { };
|
||||
mopidy-spotify = callPackage ./spotify.nix { };
|
||||
|
||||
mopidy-somafm = callPackage ./somafm.nix { };
|
||||
mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
|
||||
|
||||
mopidy-soundcloud = callPackage ./soundcloud.nix { };
|
||||
mopidy-tunein = callPackage ./tunein.nix { };
|
||||
|
||||
mopidy-spotify = callPackage ./spotify.nix { };
|
||||
mopidy-youtube = callPackage ./youtube.nix { };
|
||||
|
||||
mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { };
|
||||
|
||||
mopidy-tunein = callPackage ./tunein.nix { };
|
||||
|
||||
mopidy-youtube = callPackage ./youtube.nix { };
|
||||
|
||||
mopidy-subidy = callPackage ./subidy.nix { };
|
||||
};
|
||||
|
||||
in self
|
||||
mopidy-subidy = callPackage ./subidy.nix { };
|
||||
})
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "20200714";
|
||||
version = "20210114";
|
||||
pname = "x42-plugins";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
|
||||
sha256 = "1av05ykph8x67018hm9zfgh1vk0zi39mvrsxkj6bm4hkarxf0vvl";
|
||||
sha256 = "sha256-xUiA/k5ZbI/SkY8a20FsyRwqPxxMteiFdEhFF/8e2OA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clight";
|
||||
version = "4.2";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FedeDP";
|
||||
repo = "Clight";
|
||||
rev = version;
|
||||
sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg=";
|
||||
sha256 = "sha256-fvi0JGNNDoxE0iH//HneYwQBBP4mY75AeViLHKQUI30=";
|
||||
};
|
||||
|
||||
# dbus-1.pc has datadir=/etc
|
||||
|
||||
@ -89,6 +89,5 @@ mkChromiumDerivation (base: rec {
|
||||
then ["aarch64-linux" "x86_64-linux"]
|
||||
else [];
|
||||
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
|
||||
broken = elem channel [ "dev" ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, xdg-utils, yasm, nasm, minizip, libwebp
|
||||
, libusb1, pciutils, nss, re2
|
||||
|
||||
, python2Packages, python3Packages, perl, pkg-config
|
||||
, python2Packages, perl, pkg-config
|
||||
, nspr, systemd, libkrb5
|
||||
, util-linux, alsaLib
|
||||
, bison, gperf
|
||||
@ -130,8 +130,6 @@ let
|
||||
ninja which python2Packages.python perl pkg-config
|
||||
python2Packages.ply python2Packages.jinja2 nodejs
|
||||
gnutar python2Packages.setuptools
|
||||
] ++ optionals (chromiumVersionAtLeast "91") [
|
||||
python3Packages.python
|
||||
];
|
||||
|
||||
buildInputs = defaultDependencies ++ [
|
||||
@ -163,9 +161,14 @@ let
|
||||
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
|
||||
}) ++ optional (chromiumVersionAtLeast "90")
|
||||
./patches/fix-missing-atspi2-dependency.patch
|
||||
++ optional (chromiumVersionAtLeast "91")
|
||||
++ optionals (chromiumVersionAtLeast "91") [
|
||||
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
|
||||
;
|
||||
(githubPatch
|
||||
# Revert "Reland #7 of "Force Python 3 to be used in build.""
|
||||
"38b6a9a8e5901766613879b6976f207aa163588a"
|
||||
"1lvxbd7rl6hz5j6kh6q83yb6vd9g7anlqbai8g1w1bp6wdpgwvp9"
|
||||
)
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove unused third-party
|
||||
|
||||
@ -17,8 +17,9 @@
|
||||
, webkitgtk
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "feeds";
|
||||
pname = "gnome-feeds";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-fastjet=${fastjet}"
|
||||
"--enable-lhapdf=${lhapdf}"
|
||||
"--enable-rivet=${rivet}"
|
||||
"--enable-pythia"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -8,13 +8,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-cinnabar";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glandium";
|
||||
repo = "git-cinnabar";
|
||||
rev = version;
|
||||
sha256 = "1wbp4xqpkaqhhkjw8rbbsagwiciqffacqqbm4j49q41mlk371ai3";
|
||||
sha256 = "04dsjlsw98avrckldx7rc70b2zsbajzkyqqph4c7d9xd5djh3yaj";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, substituteAll, fetchpatch, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-system-monitor";
|
||||
version = "2020-04-27-unstable";
|
||||
version = "unstable-2021-04-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paradoxxxzero";
|
||||
repo = "gnome-shell-system-monitor-applet";
|
||||
rev = "7f8f0a7b255473941f14d1dcaa35ebf39d3bccd0";
|
||||
sha256 = "tUUvBY0UEUE+T79zVZEAICpKoriFZuuZzi9ArdHdXks=";
|
||||
rev = "942603da39de12f50b1f86efbde92d7526d1290e";
|
||||
sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
, "coc-diagnostic"
|
||||
, "coc-emmet"
|
||||
, "coc-eslint"
|
||||
, "coc-explorer"
|
||||
, "coc-git"
|
||||
, "coc-go"
|
||||
, "coc-highlight"
|
||||
|
||||
1041
pkgs/development/node-packages/node-packages.nix
generated
1041
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-throttle";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hallazzang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0raqnrnp42cn1c7whbm7ajbgaczx33k6hbxsj30nh998pqxhh4sj";
|
||||
sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "colorlog";
|
||||
version = "4.8.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE=";
|
||||
sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ircrobots";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesopo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cm4hcmprca24d979ydbzwn9mfxw16jki6ld7yykxryf0983nqc7";
|
||||
sha256 = "06q86dqllxvi3nssfplmjk9yxaybighwh87lrxfpfhl8yy4z68jz";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ircstates";
|
||||
version = "0.11.7";
|
||||
version = "0.11.8";
|
||||
disabled = pythonOlder "3.6"; # f-strings
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesopo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "00dyd6mry10na98x1gs92xnfpjf1wd9zpblx1wcx8ggv5rqvgqrm";
|
||||
sha256 = "0scxqcgby4vzh2q937r0wy2mb46aghjf47q3z6fp6di1b6hlj7zh";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,22 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "swisshydrodata";
|
||||
version = "0.0.3";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1adpy6k2bknffzl5rckqpvaqyrvc00d6a4a4541438dqasx61npl";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bouni";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1rdgfc6zg5j3fvrpbqs9vc3n5m66r5yljawyl7nmrqd5lwq1lqak";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
# Tests are not releases at the moment
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "swisshydrodata" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,39 +1,39 @@
|
||||
{ lib
|
||||
, fetchgit
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, enum-compat
|
||||
, fetchFromGitLab
|
||||
, future
|
||||
, ifaddr
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yeelight";
|
||||
version = "0.5.4";
|
||||
version = "0.6.0";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/stavros/python-yeelight.git";
|
||||
rev = "119faeff0d4f9de8c7f6d0580bdecc1c79bcdaea"; # v0.5.4 wasn't tagged
|
||||
sha256 = "0j2c5pzd3kny7ghr9q7xn9vs8dffvyzz5igaavvvd04w7aph29sy";
|
||||
src = fetchFromGitLab {
|
||||
owner = "stavros";
|
||||
repo = "python-yeelight";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yycc2pdqaa9y46jycvm0p6braps7ljg2vvljngdqj2l1a2jmv7x";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
ifaddr
|
||||
] ++ lib.optional (pythonOlder "3.4") enum-compat;
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
] ++ lib.optional (pythonOlder "3.3") mock;
|
||||
];
|
||||
|
||||
pytestFlagsArray = [ "yeelight/tests.py" ];
|
||||
|
||||
pythonImportsCheck = [ "yeelight" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python library for controlling YeeLight RGB bulbs";
|
||||
description = "Python library for controlling YeeLight RGB bulbs";
|
||||
homepage = "https://gitlab.com/stavros/python-yeelight/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nyanloutre ];
|
||||
|
||||
@ -74,6 +74,7 @@ source 'https://rubygems.org' do
|
||||
gem 'jekyll'
|
||||
gem 'jmespath'
|
||||
gem 'jwt'
|
||||
gem 'kramdown-rfc2629'
|
||||
gem 'libv8'
|
||||
gem 'libxml-ruby'
|
||||
gem 'magic'
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,28 +2,29 @@
|
||||
, fetchzip
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, darwin
|
||||
, Security
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
version = "0.26.0";
|
||||
version = "0.29.1";
|
||||
pname = "geckodriver";
|
||||
sourceRoot = "source/testing/geckodriver";
|
||||
|
||||
# Source revisions are noted alongside the binary releases:
|
||||
# https://github.com/mozilla/geckodriver/releases
|
||||
src = (fetchzip {
|
||||
url = "https://hg.mozilla.org/mozilla-central/archive/e9783a644016aa9b317887076618425586730d73.zip/testing";
|
||||
sha256 = "0m86hqyq1jrr49jkc8mnlmx4bdq281hyxhcrrzacyv20nlqwvd8v";
|
||||
url = "https://hg.mozilla.org/mozilla-central/archive/970ef713fe58cbc8a29bfb2fb452a57e010bdb08.zip/testing";
|
||||
sha256 = "0cpx0kx8asqkmz2nyanbmcvhnrsksgd6jp3wlcd0maid3qbyw7s2";
|
||||
}).overrideAttrs (_: {
|
||||
# normally guessed by the url's file extension, force it to unpack properly
|
||||
unpackCmd = "unzip $curSrc";
|
||||
});
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
cargoSha256 = "1dv8vcjy8r9z19grj4gms05bhaafyr42y3q69h3azwq6dmacfd3y";
|
||||
cargoSha256 = "1vajlcpyk77v6nvhs737yi8hs7ids9kz0sbwy29rm1vmmfjp2b27";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";
|
||||
|
||||
@ -483,18 +483,6 @@ let
|
||||
meta.homepage = "https://github.com/neoclide/coc-denite/";
|
||||
};
|
||||
|
||||
coc-explorer = buildVimPluginFrom2Nix {
|
||||
pname = "coc-explorer";
|
||||
version = "2021-04-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "weirongxu";
|
||||
repo = "coc-explorer";
|
||||
rev = "252b48bdd55e494fae8dce07526c0efa33ad069d";
|
||||
sha256 = "1f6pxszy7gvlz2sh9477gbxhkvjrl0ni3l8n2d6109k7lww40a3n";
|
||||
};
|
||||
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
|
||||
};
|
||||
|
||||
coc-fzf = buildVimPluginFrom2Nix {
|
||||
pname = "coc-fzf";
|
||||
version = "2021-03-21";
|
||||
|
||||
@ -800,6 +800,7 @@ self: super: {
|
||||
"coc-diagnostic"
|
||||
"coc-emmet"
|
||||
"coc-eslint"
|
||||
"coc-explorer"
|
||||
"coc-git"
|
||||
"coc-go"
|
||||
"coc-highlight"
|
||||
|
||||
@ -721,7 +721,6 @@ w0ng/vim-hybrid
|
||||
wakatime/vim-wakatime
|
||||
wannesm/wmgraphviz.vim
|
||||
wbthomason/packer.nvim
|
||||
weirongxu/coc-explorer
|
||||
wellle/targets.vim
|
||||
wellle/tmux-complete.vim
|
||||
wfxr/minimap.vim
|
||||
|
||||
@ -412,9 +412,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "github-vscode-theme";
|
||||
publisher = "github";
|
||||
version = "1.1.5";
|
||||
sha256 =
|
||||
"10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2";
|
||||
version = "3.0.0";
|
||||
sha256 = "1a77mbx75xfsfdlhgzghj9i7ik080bppc3jm8c00xp6781987fpa";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "GitHub theme for VS Code";
|
||||
|
||||
@ -1,32 +1,32 @@
|
||||
{
|
||||
"4.14": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.228-hardened1.patch",
|
||||
"sha256": "0pf3c98m2zlgxv9p10p7xw44f6mqnh8ac47jl1abz3yy3hiag0cd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.228-hardened1/linux-hardened-4.14.228-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.230-hardened1.patch",
|
||||
"sha256": "1nhaqhjga042b69969f0jy680xlrgnms1178ni6c6xhxy6n7y4pq",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.230-hardened1/linux-hardened-4.14.230-hardened1.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.184-hardened1.patch",
|
||||
"sha256": "1828kkq05808mahkfb0387b1k5qp6pysy4mny1xgpwqdphpp1pq9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.184-hardened1/linux-hardened-4.19.184-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.186-hardened1.patch",
|
||||
"sha256": "01f8scgr3shjxl6w7jqyvb38idrs0m53cafpplvz1q69axaf9gy6",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.186-hardened1/linux-hardened-4.19.186-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.27-hardened1.patch",
|
||||
"sha256": "12pzv36p0pdaqqklwv6rpk15c1z1nz2syw1si24514p63v46wmhn",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.27-hardened1/linux-hardened-5.10.27-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.29-hardened1.patch",
|
||||
"sha256": "0aj46a6bhfgn8czpmaqpnggmxzfqz29kmh9kif4v3a546q5mrq7n",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.29-hardened1/linux-hardened-5.10.29-hardened1.patch"
|
||||
},
|
||||
"5.11": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.11.11-hardened1.patch",
|
||||
"sha256": "0isq152z4h2kl3rviia9xlpsmdx331kx8p1x00jbf4gcw30amc78",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.11-hardened1/linux-hardened-5.11.11-hardened1.patch"
|
||||
"name": "linux-hardened-5.11.13-hardened1.patch",
|
||||
"sha256": "008izyg6a2dycxczfixykshll5hq5gff216fhgl1azr4ymiicywy",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.13-hardened1/linux-hardened-5.11.13-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.109-hardened1.patch",
|
||||
"sha256": "19likbds74lzym969p6hbchlfii4qnsp8y4ryfkba1vv6hv51zzj",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.109-hardened1/linux-hardened-5.4.109-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.111-hardened1.patch",
|
||||
"sha256": "1zvhdyhvmzi58g07bsg8140nf9k29dzxlbqvha2sylnlj99sjjfd",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.111-hardened1/linux-hardened-5.4.111-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.228";
|
||||
version = "4.14.230";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0nw1jf6x5a990n69aw2da4s4lc1c7mnwiwcda40bl2rkmd24s1qm";
|
||||
sha256 = "1gn5cs1ss4bfsnnv0b2s4g5ibiigpzsx0i3qfswchdbxvdag75cw";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.184";
|
||||
version = "4.19.186";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0z5pgal8775rf7pvpxq47dnghr42al2k9py0s9jl3js2wamgdyix";
|
||||
sha256 = "0cg6ja7plry1l2mg6hx16lsw0gzn4xpj7xdrrs2hwl8l8a2dgifq";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.264";
|
||||
version = "4.4.266";
|
||||
extraMeta.branch = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1b0d735qnk0bcqn9gdsjqxhk8pkb3597ya9f34lv1vjfaqkkxk7l";
|
||||
sha256 = "00x2dmjiiv9zpc0vih9xqmf78kynqzj9q9v1chc2q2hcjpqfj31c";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.264";
|
||||
version = "4.9.266";
|
||||
extraMeta.branch = "4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1df2dv26c9z6zsdlqzbcc60f2pszh0hx1n94v65jswlb72a2mipc";
|
||||
sha256 = "0qzigcslfp714vaswwlw93xj0h2f8laikppw6krrhfnh5wwrp5dr";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.27";
|
||||
version = "5.10.29";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr";
|
||||
sha256 = "1v79wylb2kd9gadiqf7dr7jcgynr970bbga09mdn940sq536g30m";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.11.11";
|
||||
version = "5.11.13";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a";
|
||||
sha256 = "0yvgkc1fmmd4g06sydn51q4l3g5785q9yaaq04lv3kgj4hyijqgs";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.109";
|
||||
version = "5.4.111";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc";
|
||||
sha256 = "00qs4y4d9adffwysdh8sly81hxc3rw7bi9vs3fs4rhwdclr62qi1";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "17920";
|
||||
sha256 = "0qmhabh4922lpiimrh9smi1q0w8giw3qqxpyzzy2bmr2037011k0";
|
||||
rev = "17990";
|
||||
sha256 = "1hras4018lgvql1zxw26fzcvk0w1xh6pyh3kmhxxh23k61zl83zk";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.25-rt35"; # updated by ./update-rt.sh
|
||||
version = "5.10.27-rt36"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@ -18,14 +18,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk";
|
||||
sha256 = "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "0kvawcyxg0xzhx73xs9g9s0hr7bs44sy4zvfzvcg2m9hdyafry0k";
|
||||
sha256 = "1bx023ibav6n2di3i2m8i6n4hp7h6zmz9bva7nqxdflbdwfsma1c";
|
||||
};
|
||||
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
|
||||
|
||||
|
||||
@ -372,6 +372,7 @@ in with py.pkgs; buildPythonApplication rec {
|
||||
"wled"
|
||||
"workday"
|
||||
"worldclock"
|
||||
"yeelight"
|
||||
"zeroconf"
|
||||
"zha"
|
||||
"zone"
|
||||
|
||||
@ -193,15 +193,21 @@ in rec {
|
||||
"__darwinAllowLocalNetworking"
|
||||
"__impureHostDeps" "__propagatedImpureHostDeps"
|
||||
"sandboxProfile" "propagatedSandboxProfile"])
|
||||
// (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) {
|
||||
name = "${attrs.pname}-${attrs.version}";
|
||||
} // (lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix && (attrs ? name || (attrs ? pname && attrs ? version)))) {
|
||||
# Fixed-output derivations like source tarballs shouldn't get a host
|
||||
# suffix. But we have some weird ones with run-time deps that are
|
||||
# just used for their side-affects. Those might as well since the
|
||||
# hash can't be the same. See #32986.
|
||||
name = "${attrs.name or "${attrs.pname}-${attrs.version}"}-${stdenv.hostPlatform.config}";
|
||||
} // {
|
||||
// (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
|
||||
name =
|
||||
let
|
||||
staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static";
|
||||
name' = attrs.name or
|
||||
"${attrs.pname}${staticMarker}-${attrs.version}";
|
||||
# Fixed-output derivations like source tarballs shouldn't get a host
|
||||
# suffix. But we have some weird ones with run-time deps that are
|
||||
# just used for their side-affects. Those might as well since the
|
||||
# hash can't be the same. See #32986.
|
||||
hostSuffix = lib.optionalString
|
||||
(stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
|
||||
"-${stdenv.hostPlatform.config}";
|
||||
in name' + hostSuffix;
|
||||
}) // {
|
||||
builder = attrs.realBuilder or stdenv.shell;
|
||||
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
|
||||
inherit stdenv;
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-gwFX5c5y4bL+KhPDnvCbDco1ORYyqZYFsetMrmOATZU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2cs+5UL3tNfUzjlFIdsG05moiOktXSJOZJlgo/rZINw=";
|
||||
cargoSha256 = "sha256-gWCiaAgb7hBenbp1kogCoB6vctYfDZccRW9li2yxJaU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
@ -7,10 +7,6 @@
|
||||
, tkremind ? true
|
||||
}:
|
||||
|
||||
assert tkremind -> tk != null;
|
||||
assert tkremind -> tcllib != null;
|
||||
assert tkremind -> makeWrapper != null;
|
||||
|
||||
let
|
||||
inherit (lib) optional optionalString;
|
||||
tclLibraries = lib.optionals tkremind [ tcllib tk ];
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apk-tools";
|
||||
version = "2.12.2";
|
||||
version = "2.12.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.alpinelinux.org";
|
||||
owner = "alpine";
|
||||
repo = "apk-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29";
|
||||
sha256 = "0961l2qigs3wwn8lpi5f2wnzn4y4cipcm6qcr40fqj4xyq2hz2ja";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config scdoc ]
|
||||
|
||||
@ -24,14 +24,13 @@ common =
|
||||
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
|
||||
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
, name, suffix ? "", src
|
||||
, pname, version, suffix ? "", src
|
||||
, patches ? [ ]
|
||||
}:
|
||||
let
|
||||
sh = busybox-sandbox-shell;
|
||||
nix = stdenv.mkDerivation rec {
|
||||
inherit name src patches;
|
||||
version = lib.getVersion name;
|
||||
inherit pname version src patches;
|
||||
|
||||
is24 = lib.versionAtLeast version "2.4pre";
|
||||
|
||||
@ -196,9 +195,10 @@ in rec {
|
||||
nix = nixStable;
|
||||
|
||||
nixStable = callPackage common (rec {
|
||||
name = "nix-2.3.10";
|
||||
pname = "nix";
|
||||
version = "2.3.10";
|
||||
src = fetchurl {
|
||||
url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz";
|
||||
url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab";
|
||||
};
|
||||
|
||||
@ -213,7 +213,8 @@ in rec {
|
||||
});
|
||||
|
||||
nixUnstable = lib.lowPrio (callPackage common rec {
|
||||
name = "nix-2.4${suffix}";
|
||||
pname = "nix";
|
||||
version = "2.4${suffix}";
|
||||
suffix = "pre20210326_dd77f71";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'kramdown-rfc2629'
|
||||
@ -1,19 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
certified (1.0.0)
|
||||
json_pure (2.5.1)
|
||||
kramdown (1.17.0)
|
||||
kramdown-rfc2629 (1.3.37)
|
||||
certified (~> 1.0)
|
||||
json_pure (~> 2.0)
|
||||
kramdown (~> 1.17.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
kramdown-rfc2629
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
@ -1,18 +0,0 @@
|
||||
{ lib, bundlerApp }:
|
||||
|
||||
# Not in the default ../../../development/ruby-modules/with-packages/Gemfile
|
||||
# because of version clash on the "kramdown" dependency.
|
||||
bundlerApp rec {
|
||||
pname = "kramdown-rfc2629";
|
||||
gemdir = ./.;
|
||||
exes = [ "kramdown-rfc2629" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A markdown parser with multiple backends";
|
||||
homepage = "https://github.com/cabo/kramdown-rfc2629";
|
||||
license = with licenses; mit;
|
||||
maintainers = with maintainers; [
|
||||
vcunat # not really, but I expect to use it occasionally around IETF
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
{
|
||||
certified = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1706p6p0a8adyvd943af2a3093xakvislgffw3v9dvp7j07dyk5a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
json_pure = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "030hmc268wchqsccbjk41hvbyg99krpa72i3q0y3wwqzfh8hi736";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
};
|
||||
kramdown = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.0";
|
||||
};
|
||||
kramdown-rfc2629 = {
|
||||
dependencies = ["certified" "json_pure" "kramdown"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16m08q5bgib3i54bb9p3inrxb1xksiybs9zj1rnncq492gcqqv4j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.37";
|
||||
};
|
||||
}
|
||||
@ -341,6 +341,7 @@ mapAliases ({
|
||||
krename-qt5 = krename; # added 2017-02-18
|
||||
kerberos = libkrb5; # moved from top-level 2021-03-14
|
||||
keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
|
||||
kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23
|
||||
kvm = qemu_kvm; # added 2018-04-25
|
||||
latinmodern-math = lmmath;
|
||||
letsencrypt = certbot; # added 2016-05-16
|
||||
|
||||
@ -2514,7 +2514,9 @@ in
|
||||
|
||||
go-neb = callPackage ../applications/networking/instant-messengers/go-neb { };
|
||||
|
||||
geckodriver = callPackage ../development/tools/geckodriver { };
|
||||
geckodriver = callPackage ../development/tools/geckodriver {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
geekbench = callPackage ../tools/misc/geekbench { };
|
||||
|
||||
@ -2665,8 +2667,6 @@ in
|
||||
|
||||
klaus = with python3Packages; toPythonApplication klaus;
|
||||
|
||||
kramdown-rfc2629 = callPackage ../tools/text/kramdown-rfc2629 { };
|
||||
|
||||
klipper = callPackage ../servers/klipper { };
|
||||
|
||||
klog = qt5.callPackage ../applications/radio/klog { };
|
||||
@ -4378,8 +4378,6 @@ in
|
||||
|
||||
feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
|
||||
|
||||
feeds = callPackage ../applications/networking/feedreaders/feeds {};
|
||||
|
||||
fend = callPackage ../tools/misc/fend { };
|
||||
|
||||
ferm = callPackage ../tools/networking/ferm { };
|
||||
@ -4963,6 +4961,8 @@ in
|
||||
|
||||
gnome-builder = callPackage ../applications/editors/gnome-builder { };
|
||||
|
||||
gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {};
|
||||
|
||||
gnome-keysign = callPackage ../tools/security/gnome-keysign { };
|
||||
|
||||
gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { };
|
||||
@ -22182,6 +22182,8 @@ in
|
||||
|
||||
bookworm = callPackage ../applications/office/bookworm { };
|
||||
|
||||
CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { };
|
||||
|
||||
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
|
||||
|
||||
chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
|
||||
|
||||
@ -235,6 +235,16 @@
|
||||
};
|
||||
version = "2.1.532";
|
||||
};
|
||||
certified = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1706p6p0a8adyvd943af2a3093xakvislgffw3v9dvp7j07dyk5a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
CFPropertyList = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -1222,6 +1232,16 @@
|
||||
};
|
||||
version = "2.5.1";
|
||||
};
|
||||
json_pure = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "030hmc268wchqsccbjk41hvbyg99krpa72i3q0y3wwqzfh8hi736";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
};
|
||||
jwt = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -1254,6 +1274,17 @@
|
||||
};
|
||||
version = "1.1.0";
|
||||
};
|
||||
kramdown-rfc2629 = {
|
||||
dependencies = ["certified" "json_pure" "kramdown"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p1iviq8q9za2hg0vqyrarrc3mqfskgp7spxp37xj0kl3g89vswq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.1";
|
||||
};
|
||||
libv8 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user