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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-09 01:00:25 +00:00 committed by GitHub
commit e251591528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 2325 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -4654,6 +4654,12 @@
githubId = 2029444;
name = "James Kent";
};
ketzacoatl = {
email = "ketzacoatl@protonmail.com";
github = "ketzacoatl";
githubId = 10122937;
name = "ketzacoatl";
};
kevincox = {
email = "kevincox@kevincox.ca";
github = "kevincox";
@ -8849,6 +8855,12 @@
githubId = 2389333;
name = "Andy Tockman";
};
Technical27 = {
email = "38222826+Technical27@users.noreply.github.com";
github = "Technical27";
githubId = 38222826;
name = "Aamaruvi Yogamani";
};
teh = {
email = "tehunger@gmail.com";
github = "teh";

8
nixos/modules/system/boot/tmp.nix
View File

@ -30,7 +30,13 @@ with lib;
config = {
systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount";
systemd.mounts = mkIf config.boot.tmpOnTmpfs [
{
what = "tmpfs";
where = "/tmp";
mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ];
}
];
systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root";

25
pkgs/applications/blockchains/lndconnect/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "lndconnect";
version = "0.2.0";
goPackagePath = "github.com/LN-Zap/lndconnect";
src = fetchFromGitHub {
owner = "LN-Zap";
repo = pname;
rev = "v${version}";
sha256 = "0zp23vp4i4csc6x1b6z39rqcmknxd508x6clr8ckdj2fwjwkyf5a";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "Generate QRCode to connect apps to lnd Resources";
license = licenses.mit;
homepage = "https://github.com/LN-Zap/lndconnect";
maintainers = [ maintainers.xwvvvvwx ];
platforms = platforms.linux;
};
}

129
pkgs/applications/blockchains/lndconnect/deps.nix generated Normal file
View File

@ -0,0 +1,129 @@
[
{
goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go";
fetch = {
type = "git";
url = "https://github.com/Baozisoftware/qrcode-terminal-go";
rev = "c0650d8dff0f053901ff16185217b950d5e7743c";
sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b";
};
}
{
goPackagePath = "github.com/btcsuite/btcd";
fetch = {
type = "git";
url = "https://github.com/btcsuite/btcd";
rev = "e9a51e8dcd673c563a549676ebd4384b0318a9b7";
sha256 = "053pdhhycls7cpygg4rhc0y2p937ni4cgxylgxd1zpwffqdjsxrs";
};
}
{
goPackagePath = "github.com/btcsuite/btclog";
fetch = {
type = "git";
url = "https://github.com/btcsuite/btclog";
rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a";
sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
};
}
{
goPackagePath = "github.com/btcsuite/btcutil";
fetch = {
type = "git";
url = "https://github.com/btcsuite/btcutil";
rev = "063c4115b3a9a7201e82447875383890698abcb6";
sha256 = "12dpy5ipmd751xb71hcmrl9xyl89r5rflnrvypnz1irairfqwjwm";
};
}
{
goPackagePath = "github.com/glendc/go-external-ip";
fetch = {
type = "git";
url = "https://github.com/glendc/go-external-ip";
rev = "c872357d968e33d5d9c47ea2c603f3b411150ecc";
sha256 = "1h9cdhab4fapa2p1r8sgl1pxv4qi1zskw8x0pj93a81y03zzr2l1";
};
}
{
goPackagePath = "github.com/jessevdk/go-flags";
fetch = {
type = "git";
url = "https://github.com/jessevdk/go-flags";
rev = "c17162fe8fd74f119ff938c5c67af63e3bac5ded";
sha256 = "0byp3f79b0399n7g6nm59afb6gj9cknfqgfqadvpppv7lvnd34jf";
};
}
{
goPackagePath = "github.com/lightningnetwork/lnd";
fetch = {
type = "git";
url = "https://github.com/lightningnetwork/lnd";
rev = "fd962d322ae2a913cc357dbb63382f22a9a0a6ce";
sha256 = "0yj2vqb9qg5v0rbchkpwhhw51rp31z76zchhhbc837sz8l8lryra";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "f6c00982823144337e56cdb71c712eaac151d29c";
sha256 = "08y5c01bvyqxraj3wc0di80gbp87178rsshb74x0p3m7wwfv82l3";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc";
sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd";
};
}
{
goPackagePath = "github.com/miekg/dns";
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
rev = "7a5f1127f7f4e461b7400d6a9df1bc523e7448fd";
sha256 = "1xwg6zwlxwkm1x121b3idir76h7wr9wmcdmg4vgj9hma903s63md";
};
}
{
goPackagePath = "github.com/skip2/go-qrcode";
fetch = {
type = "git";
url = "https://github.com/skip2/go-qrcode";
rev = "da1b6568686e89143e94f980a98bc2dbd5537f13";
sha256 = "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a";
sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "05aa5d4ee32165add31ddef9d5d3946713e5dc5e";
sha256 = "1v532mdb32h2gan6lc9ssya2v1lk6nzyzqvxn5nkbxij9x4v1jkl";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "9d91bd62050c7b3011b7df0d2a4daa0042684420";
sha256 = "0d2jjd7r0zwakd1d2g2qm59w6jc6sgg0sal5gc626i8nn9adj2jg";
};
}
]

5
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -143,11 +143,6 @@ let
flycheck-rtags = fix-rtags super.flycheck-rtags;
gnuplot = super.gnuplot.overrideAttrs (old: {
nativeBuildInputs =
(old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ];
});
pdf-tools = super.pdf-tools.overrideAttrs (old: {
nativeBuildInputs = [ external.pkgconfig ];
buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ];

20
pkgs/applications/misc/blender/default.nix
View File

@ -1,4 +1,4 @@
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
@ -13,9 +13,14 @@
}:
with lib;
let
python = python3Packages.python;
optix = fetchzip {
url = "https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip";
sha256 = "1b3ccd3197anya2bj3psxdrvrpfgiwva5zfv2xmyrl73nb2dvfr7";
};
let python = python3Packages.python; in
in
stdenv.mkDerivation rec {
pname = "blender";
version = "2.91.0";
@ -111,7 +116,11 @@ stdenv.mkDerivation rec {
# Clang doesn't support "-export-dynamic"
++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS="
++ optional jackaudioSupport "-DWITH_JACK=ON"
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON";
++ optional cudaSupport [
"-DWITH_CYCLES_CUDA_BINARIES=ON"
"-DWITH_CYCLES_DEVICE_OPTIX=ON"
"-DOPTIX_ROOT_DIR=${optix}"
];
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}";
@ -142,7 +151,8 @@ stdenv.mkDerivation rec {
homepage = "https://www.blender.org";
# They comment two licenses: GPLv2 and Blender License, but they
# say: "We've decided to cancel the BL offering for an indefinite period."
license = licenses.gpl2Plus;
# OptiX, enabled with cudaSupport, is non-free.
license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ goibhniu veprbl ];
};

6
pkgs/applications/video/makemkv/default.nix
View File

@ -13,21 +13,21 @@
}:
let
version = "1.15.3";
version = "1.15.4";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8=";
hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o=";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw=";
hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M=";
};
in mkDerivation {
pname = "makemkv";

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz";
sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/545d5cafa765c97ad6026ac96f42a246fea7675b.tar.gz";
sha256 = "0v35kbbhmyc5yn1k4v9j32d2bj7zwlwfrwf1cppifdvwdhfs25vv";
}

61
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -217,7 +217,24 @@ self: super: {
# building of the executable has been disabled for ghc < 8.10 in hnix.
# Generating the completions should be activated again, once we default to
# ghc 8.10.
hnix = dontCheck super.hnix;
hnix = dontCheck (super.hnix.override {
# 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly.
# https://github.com/haskell-nix/hnix-store/issues/104
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
# the 0_4_0_0 is used
hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
});
# 2021-01-07: NOTE: hnix-store-core pinned at ==0.2 in Stackage Nightly.
# https://github.com/haskell-nix/hnix-store/issues/104
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
# the 0_4_0_0 is used
hnix-store-remote = (super.hnix-store-remote.override {
hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
});
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
@ -805,11 +822,20 @@ self: super: {
# Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
pointfree = doJailbreak super.pointfree;
# Depends on base <4.12
# See https://github.com/haskell-hvr/cryptohash-sha512/pull/3
# , https://github.com/haskell-hvr/cryptohash-sha512/issues/4
# and https://github.com/haskell-hvr/cryptohash-sha512/pull/5
cryptohash-sha512 = doJailbreak super.cryptohash-sha512;
# The project is stale
#
# Archiving request: https://github.com/haskell-hvr/cryptohash-sha512/issues/6
#
# doJailbreak since base <4.12 && bytestring <0.11
# Request to support:
# https://github.com/haskell-hvr/cryptohash-sha512/issues/4
# PRs to support base <4.12:
# https://github.com/haskell-hvr/cryptohash-sha512/pull/3
# https://github.com/haskell-hvr/cryptohash-sha512/pull/5
#
# dontCheck since test suite does not support new `base16-bytestring` >= 1 format
# https://github.com/haskell-hvr/cryptohash-sha512/pull/5#issuecomment-752796913
cryptohash-sha512 = dontCheck (doJailbreak super.cryptohash-sha512);
# Depends on tasty < 1.x, which we don't have.
cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
@ -1309,7 +1335,7 @@ self: super: {
commonmark-extensions = dontCheck super.commonmark-extensions;
# Testsuite trying to run `which haskeline-examples-Test`
haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0;
haskeline_0_8_1_1 = dontCheck super.haskeline_0_8_1_1;
# Tests for list-t, superbuffer, and stm-containers
# depend on HTF and it is broken, 2020-08-23
@ -1483,22 +1509,7 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
# 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released
# https://github.com/cachix/cachix/pull/331
cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74";
stripLen = 2;
extraPrefix = "";
includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ];
});
cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch {
url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch;
sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp";
stripLen = 2;
extraPrefix = "";
excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ];
}));
cachix = generateOptparseApplicativeCompletion "cachix" super.cachix;
# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
pipes-text = doJailbreak super.pipes-text;
@ -1552,4 +1563,8 @@ self: super: {
servant-client = doJailbreak super.servant-client;
servant-client-core = doJailbreak super.servant-client-core;
# overly strict dependency on aeson
# https://github.com/jaspervdj/profiteur/issues/33
profiteur = doJailbreak super.profiteur;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

196
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -76,7 +76,7 @@ default-package-overrides:
# haskell-language-server 0.5.0.0 doesn't accept newer versions
- fourmolu ==0.2.*
- refinery ==0.2.*
# Stackage Nightly 2021-01-01
# Stackage Nightly 2021-01-05
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
@ -86,7 +86,7 @@ default-package-overrides:
- ad ==4.4.1
- adjunctions ==4.4
- adler32 ==0.1.2.0
- aeson ==1.5.4.1
- aeson ==1.5.5.1
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
@ -261,7 +261,7 @@ default-package-overrides:
- attoparsec-base64 ==0.0.0
- attoparsec-binary ==0.2
- attoparsec-expr ==0.1.1.2
- attoparsec-iso8601 ==1.0.1.0
- attoparsec-iso8601 ==1.0.2.0
- attoparsec-path ==0.0.0.1
- audacity ==0.0.2
- aur ==7.0.5
@ -334,7 +334,6 @@ default-package-overrides:
- bits-extra ==0.0.2.0
- bitset-word8 ==0.1.1.2
- bitvec ==1.0.3.0
- bitwise-enum ==1.0.0.2
- blake2 ==0.3.0
- blanks ==0.5.0
- blas-carray ==0.1.0.1
@ -520,10 +519,10 @@ default-package-overrides:
- conduit-extra ==1.3.5
- conduit-parse ==0.2.1.0
- conduit-zstd ==0.0.2.0
- conferer ==0.4.1.1
- conferer-hspec ==0.4.0.1
- conferer-source-json ==0.4.0.1
- conferer-warp ==0.4.0.1
- conferer ==1.0.0.0
- conferer-aeson ==1.0.0.0
- conferer-hspec ==1.0.0.0
- conferer-warp ==1.0.0.0
- config-ini ==0.2.4.0
- ConfigFile ==1.1.4
- configurator ==0.3.0.0
@ -690,6 +689,7 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doldol ==0.4.1.2
- dot ==0.3
- dotenv ==0.8.0.7
- dotgen ==0.4.3
- dotnet-timespan ==0.0.1.0
@ -845,6 +845,7 @@ default-package-overrides:
- focus ==1.0.2
- focuslist ==0.1.0.2
- fold-debounce ==0.2.0.9
- fold-debounce-conduit ==0.2.0.5
- foldable1 ==0.1.0.0
- foldl ==1.4.10
- folds ==0.7.5
@ -937,11 +938,11 @@ default-package-overrides:
- ghc-prof ==1.4.1.7
- ghc-source-gen ==0.4.0.0
- ghc-syntax-highlighter ==0.0.6.0
- ghc-tcplugins-extra ==0.4
- ghc-tcplugins-extra ==0.4.1
- ghc-trace-events ==0.1.2.1
- ghc-typelits-extra ==0.4.1
- ghc-typelits-knownnat ==0.7.3
- ghc-typelits-natnormalise ==0.7.2
- ghc-typelits-extra ==0.4.2
- ghc-typelits-knownnat ==0.7.4
- ghc-typelits-natnormalise ==0.7.3
- ghc-typelits-presburger ==0.3.0.1
- ghci-hexcalc ==0.1.1.0
- ghcid ==0.8.7
@ -995,6 +996,9 @@ default-package-overrides:
- graphs ==0.7.1
- graphviz ==2999.20.1.0
- gravatar ==0.8.0
- greskell ==1.2.0.0
- greskell-core ==0.1.3.5
- greskell-websocket ==0.1.2.5
- groom ==0.1.2.1
- group-by-date ==0.1.0.3
- groups ==0.5.2
@ -1008,7 +1012,7 @@ default-package-overrides:
- hadolint ==1.19.0
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.3
- half ==0.3
- half ==0.3.1
- hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
@ -1022,7 +1026,7 @@ default-package-overrides:
- hashing ==0.1.0.1
- hashmap ==1.3.3
- hashtables ==1.2.4.1
- haskeline ==0.8.1.0
- haskeline ==0.8.1.1
- haskell-gi ==0.24.7
- haskell-gi-base ==0.24.5
- haskell-gi-overloading ==1.0
@ -1100,7 +1104,7 @@ default-package-overrides:
- hoauth2 ==1.16.0
- hocon ==0.1.0.4
- hOpenPGP ==2.9.5
- hopenpgp-tools ==0.23.3
- hopenpgp-tools ==0.23.6
- hopfli ==0.2.2.1
- hosc ==0.18.1
- hostname ==1.0
@ -1136,12 +1140,12 @@ default-package-overrides:
- HsOpenSSL ==0.11.5.1
- HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0
- hspec ==2.7.4
- hspec ==2.7.5
- hspec-attoparsec ==0.1.0.2
- hspec-checkers ==0.1.0.2
- hspec-contrib ==0.5.1
- hspec-core ==2.7.4
- hspec-discover ==2.7.4
- hspec-core ==2.7.5
- hspec-discover ==2.7.5
- hspec-expectations ==0.8.2
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.5
@ -1151,6 +1155,7 @@ default-package-overrides:
- hspec-leancheck ==0.0.4
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.6.0
- hspec-need-env ==0.1.0.5
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tables ==0.0.1
@ -1211,7 +1216,7 @@ default-package-overrides:
- hw-json-simd ==0.1.1.0
- hw-json-simple-cursor ==0.1.1.0
- hw-json-standard-cursor ==0.2.3.1
- hw-kafka-client ==4.0.0
- hw-kafka-client ==4.0.1
- hw-mquery ==0.2.1.0
- hw-packed-vector ==0.2.1.0
- hw-parser ==0.1.1.0
@ -1263,7 +1268,7 @@ default-package-overrides:
- influxdb ==1.9.0
- ini ==0.4.1
- inj ==1.0
- inline-c ==0.9.1.3
- inline-c ==0.9.1.4
- inline-c-cpp ==0.4.0.2
- inline-r ==0.10.4
- inliterate ==0.1.0
@ -1399,7 +1404,7 @@ default-package-overrides:
- libgit ==0.3.1
- libgraph ==1.14
- libjwt-typed ==0.2
- libmpd ==0.9.2.0
- libmpd ==0.9.3.0
- liboath-hs ==0.0.1.2
- libyaml ==0.1.2
- LibZip ==1.0.1
@ -1461,6 +1466,8 @@ default-package-overrides:
- markov-chain ==0.0.3.4
- massiv ==0.5.9.0
- massiv-io ==0.4.0.0
- massiv-persist ==0.1.0.0
- massiv-serialise ==0.1.0.0
- massiv-test ==0.1.6
- math-extras ==0.1.1.0
- math-functions ==0.3.4.1
@ -1889,7 +1896,7 @@ default-package-overrides:
- quickcheck-classes ==0.6.4.0
- quickcheck-classes-base ==0.6.1.0
- quickcheck-higherorder ==0.1.0.0
- quickcheck-instances ==0.3.25.1
- quickcheck-instances ==0.3.25.2
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.1.1
- quickcheck-special ==0.1.0.6
@ -1932,7 +1939,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- readable ==0.3.1
- reanimate ==1.1.2.1
- reanimate ==1.1.3.1
- reanimate-svg ==0.13.0.0
- rebase ==1.6.1
- record-dot-preprocessor ==0.2.7
@ -2295,7 +2302,7 @@ default-package-overrides:
- Taxonomy ==2.1.0
- TCache ==0.12.1
- tce-conf ==1.3
- tdigest ==0.2.1
- tdigest ==0.2.1.1
- template-haskell-compat-v0208 ==0.1.5
- temporary ==1.3
- temporary-rc ==1.2.0.3
@ -2330,7 +2337,7 @@ default-package-overrides:
- text-short ==0.1.3
- text-show ==3.9
- text-show-instances ==3.8.4
- text-zipper ==0.10.1
- text-zipper ==0.11
- textlocal ==0.1.0.5
- tf-random ==0.5
- tfp ==1.0.1.1
@ -2457,7 +2464,7 @@ default-package-overrides:
- uniplate ==1.6.13
- uniprot-kb ==0.1.2.0
- uniq-deep ==1.2.0
- unique ==0
- unique ==0.0.1
- unique-logic ==0.4
- unique-logic-tf ==0.5.1
- unit-constraint ==0.0.0
@ -2486,7 +2493,7 @@ default-package-overrides:
- users ==0.5.0.0
- utf8-conversions ==0.1.0.4
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- utf8-string ==1.0.2
- util ==0.1.17.1
- utility-ht ==0.0.15
- uuid ==1.3.13
@ -2536,7 +2543,7 @@ default-package-overrides:
- wai-cors ==0.2.7
- wai-enforce-https ==0.0.2.1
- wai-eventsource ==3.0.0
- wai-extra ==3.1.4.1
- wai-extra ==3.1.5
- wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6
@ -2568,6 +2575,8 @@ default-package-overrides:
- weigh ==0.0.16
- wide-word ==0.1.1.2
- wikicfp-scraper ==0.1.0.11
- wild-bind ==0.1.2.6
- wild-bind-x11 ==0.2.0.11
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
@ -2638,7 +2647,7 @@ default-package-overrides:
- yesod-form ==1.6.7
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.0
- yesod-page-cursor ==2.0.0.1
- yesod-paginator ==1.1.1.0
- yesod-persistent ==1.6.0.5
- yesod-sitemap ==1.6.0
@ -3134,6 +3143,7 @@ broken-packages:
- Annotations
- anonymous-sums
- anonymous-sums-tests
- ansi-terminal-game
- ansigraph
- antagonist
- antfarm
@ -3193,6 +3203,7 @@ broken-packages:
- applicative-quoters
- applicative-splice
- approveapi
- approx
- ApproxFun-hs
- arb-fft
- arbb-vm
@ -3200,7 +3211,6 @@ broken-packages:
- arbor-monad-counter
- arbor-monad-metric
- arbor-monad-metric-datadog
- arbtt
- arch-hs
- archive-libarchive
- archiver
@ -3399,6 +3409,7 @@ broken-packages:
- basex-client
- BASIC
- basic
- basic-sop
- baskell
- batchd
- battlenet
@ -3497,6 +3508,7 @@ broken-packages:
- bindings-K8055
- bindings-libftdi
- bindings-libg15
- bindings-libpci
- bindings-librrd
- bindings-libstemmer
- bindings-libusb
@ -3663,7 +3675,9 @@ broken-packages:
- broker-haskell
- bronyradiogermany-common
- bronyradiogermany-streaming
- brotli
- brotli-conduit
- brotli-streams
- browscap
- bsd-sysctl
- bson
@ -3783,6 +3797,7 @@ broken-packages:
- cache-polysemy
- cached
- caching
- caching-vault
- cacophony
- cafeteria-prelude
- caffegraph
@ -3949,6 +3964,7 @@ broken-packages:
- chunky
- church
- church-maybe
- churros
- cielo
- cil
- cinvoke
@ -3956,6 +3972,7 @@ broken-packages:
- cipher-blowfish
- ciphersaber2
- circlehs
- circular
- citation-resolve
- citeproc-hs
- citeproc-hs-pandoc-filter
@ -4172,9 +4189,13 @@ broken-packages:
- conduit-vfs-zip
- conf
- confcrypt
- conferer-dhall
- conferer-provider-dhall
- conferer-provider-json
- conferer-provider-yaml
- conferer-source-dhall
- conferer-source-json
- conferer-source-yaml
- conffmt
- confide
- config-parser
@ -4192,6 +4213,7 @@ broken-packages:
- conkin
- conlogger
- connection-string
- connections
- Conscript
- consistent
- console-program
@ -4348,6 +4370,7 @@ broken-packages:
- cspmchecker
- cspretty
- css
- css-easings
- css-selectors
- csv-enumerator
- csv-nptools
@ -4416,6 +4439,7 @@ broken-packages:
- data-fin
- data-fin-simple
- data-flagset
- data-interval
- data-ivar
- data-kiln
- data-layer
@ -4430,6 +4454,7 @@ broken-packages:
- data-object-yaml
- data-pprint
- data-quotientref
- data-r-tree
- data-reify-cse
- data-repr
- data-result
@ -4573,11 +4598,15 @@ broken-packages:
- dgim
- dgs
- dhall-check
- dhall-docs
- dhall-fly
- dhall-json
- dhall-lsp-server
- dhall-nix
- dhall-nixpkgs
- dhall-text
- dhall-to-cabal
- dhall-yaml
- dhcp-lease-parser
- dhrun
- dia-base
@ -4642,6 +4671,7 @@ broken-packages:
- direct-plugins
- direct-rocksdb
- directed-cubical
- directory-contents
- direm
- dirfiles
- discogs-haskell
@ -4810,6 +4840,7 @@ broken-packages:
- dzen-utils
- each
- earclipper
- early
- easy-api
- easy-bitcoin
- easyjson
@ -4872,6 +4903,8 @@ broken-packages:
- elm-street
- elm-websocket
- elsa
- elynx
- elynx-tree
- emacs-keys
- emacs-module
- email
@ -4942,6 +4975,7 @@ broken-packages:
- ersatz
- ersatz-toysat
- ert
- escape-artist
- escoger
- esotericbot
- EsounD
@ -4993,6 +5027,7 @@ broken-packages:
- exference
- exherbo-cabal
- exif
- exigo-schema
- exinst-deepseq
- exinst-hashable
- exists
@ -5043,6 +5078,8 @@ broken-packages:
- FailureT
- fake
- fake-type
- fakedata
- fakedata-quickcheck
- faktory
- falling-turnip
- fallingblocks
@ -5144,6 +5181,7 @@ broken-packages:
- filesystem-enumerator
- filesystem-trees
- fillit
- Fin
- final-pretty-printer
- Finance-Quote-Yahoo
- Finance-Treasury
@ -5420,6 +5458,7 @@ broken-packages:
- generic-binary
- generic-church
- generic-enum
- generic-enumeration
- generic-lens-labels
- generic-lucid-scaffold
- generic-maybe
@ -5455,6 +5494,7 @@ broken-packages:
- geolite-csv
- geom2d
- GeomPredicates-SSE
- geos
- Get
- getemx
- getflag
@ -5790,6 +5830,7 @@ broken-packages:
- hack2-handler-mongrel2-http
- hack2-handler-snap-server
- hack2-handler-warp
- hackage-api
- hackage-diff
- hackage-mirror
- hackage-processing
@ -5985,6 +6026,7 @@ broken-packages:
- haskell-igraph
- haskell-in-space
- haskell-kubernetes
- haskell-language-server
- haskell-lsp-client
- haskell-ml
- haskell-mpfr
@ -6122,6 +6164,7 @@ broken-packages:
- hasql-queue
- hasql-simple
- hasql-th
- hasql-url
- hastache
- hastache-aeson
- haste
@ -6174,6 +6217,7 @@ broken-packages:
- hCM
- hcoap
- hcom
- hcount
- hcron
- hCsound
- hcube
@ -6219,6 +6263,7 @@ broken-packages:
- heckle
- hedgehog-checkers
- hedgehog-checkers-lens
- hedgehog-fakedata
- hedgehog-gen-json
- hedgehog-generic
- hedgehog-golden
@ -6283,6 +6328,7 @@ broken-packages:
- hexpress
- hexquote
- hext
- hextream
- heyefi
- heyting-algebras
- hF2
@ -6326,6 +6372,7 @@ broken-packages:
- hid-examples
- hidden-char
- hie-core
- hiedb
- hieraclus
- hierarchical-clustering-diagrams
- hierarchical-exceptions
@ -6348,6 +6395,7 @@ broken-packages:
- hinduce-classifier
- hinduce-classifier-decisiontree
- hinduce-examples
- hinit
- hinquire
- hinstaller
- hint-server
@ -6408,6 +6456,9 @@ broken-packages:
- hlrdb
- hlrdb-core
- hls
- hls-explicit-imports-plugin
- hls-hlint-plugin
- hls-retrie-plugin
- hlwm
- hly
- hmark
@ -6437,7 +6488,6 @@ broken-packages:
- hmt-diagrams
- hmumps
- hnetcdf
- hnix-store-remote
- HNM
- hnormalise
- ho-rewriting
@ -6446,6 +6496,7 @@ broken-packages:
- hobbes
- hobbits
- hocilib
- hocker
- hodatime
- HODE
- hoe
@ -6460,7 +6511,6 @@ broken-packages:
- hol
- hold-em
- hole
- holmes
- Holumbus-Searchengine
- holy-project
- homeomorphic
@ -6509,6 +6559,7 @@ broken-packages:
- hp2any-graph
- hp2any-manager
- hpack-convert
- hpack-dhall
- hpaco
- hpaco-lib
- hpage
@ -6793,6 +6844,7 @@ broken-packages:
- hugs2yc
- hulk
- HulkImport
- hum
- human-parse
- human-text
- humble-prelude
@ -6806,6 +6858,7 @@ broken-packages:
- hunt-server
- hup
- hurdle
- hurl
- hurriyet
- husk-scheme
- husk-scheme-libs
@ -6822,6 +6875,7 @@ broken-packages:
- hw-json-simd
- hw-json-simple-cursor
- hw-json-standard-cursor
- hw-kafka-avro
- hw-prim-bits
- hw-simd
- hw-uri
@ -7218,6 +7272,7 @@ broken-packages:
- karps
- katip-elasticsearch
- katip-kafka
- katip-raven
- katip-rollbar
- katip-scalyr-scribe
- katip-syslog
@ -7261,6 +7316,7 @@ broken-packages:
- kickchan
- kif-parser
- kit
- kleene
- kmeans-par
- kmeans-vector
- kmonad
@ -7397,6 +7453,7 @@ broken-packages:
- latex-svg-image
- latex-svg-pandoc
- LATS
- lattices
- launchdarkly-server-sdk
- launchpad-control
- lawless-concurrent-machines
@ -7429,6 +7486,7 @@ broken-packages:
- learn
- learn-physics-examples
- Learning
- leb128
- leetify
- legion
- legion-discovery
@ -7509,6 +7567,7 @@ broken-packages:
- linda
- linden
- line-bot-sdk
- line-drawing
- linear-algebra-cblas
- linear-circuit
- linear-code
@ -7772,6 +7831,8 @@ broken-packages:
- marvin-interpolate
- masakazu-bot
- MASMGen
- massiv-persist
- massiv-serialise
- master-plan
- matchers
- math-grads
@ -7803,6 +7864,7 @@ broken-packages:
- mcl
- mcm
- mcmaster-gloss-examples
- mcmc
- mcmc-samplers
- mcmc-synthesis
- mcpi
@ -8204,6 +8266,7 @@ broken-packages:
- neko-lib
- Neks
- nemesis-titan
- neptune-backend
- nerf
- nero
- nero-wai
@ -8213,6 +8276,11 @@ broken-packages:
- nested-sequence
- NestedFunctor
- nestedmap
- net-mqtt
- net-mqtt-lens
- net-mqtt-rpc
- net-spider
- net-spider-cli
- net-spider-pangraph
- net-spider-rpl
- net-spider-rpl-cli
@ -8427,6 +8495,7 @@ broken-packages:
- open-union
- OpenAFP
- OpenAFP-Utils
- openai-hs
- openapi-petstore
- openapi-typed
- openapi3
@ -8473,6 +8542,7 @@ broken-packages:
- orchid-demo
- order-maintenance
- order-statistics
- ordinal
- Ordinary
- ordrea
- oref
@ -8574,6 +8644,7 @@ broken-packages:
- parcom-lib
- parconc-examples
- pareto
- parochial
- parquet-hs
- Parry
- parse-help
@ -8679,6 +8750,7 @@ broken-packages:
- persistent-migration
- persistent-mongoDB
- persistent-mysql-haskell
- persistent-odbc
- persistent-protobuf
- persistent-ratelimit
- persistent-relational-record
@ -8806,6 +8878,7 @@ broken-packages:
- pocket-dns
- point-octree
- pointedalternative
- pointfree-fancy
- pointful
- pointless-haskell
- pointless-lenses
@ -8836,6 +8909,7 @@ broken-packages:
- polyseq
- polytypeable
- polytypeable-utils
- pomaps
- pomodoro
- pomohoro
- ponder
@ -8845,6 +8919,7 @@ broken-packages:
- pool-conduit
- pop3-client
- popenhs
- popkey
- poppler
- porcupine-core
- porcupine-http
@ -8975,7 +9050,6 @@ broken-packages:
- prof-flamegraph
- prof2dot
- prof2pretty
- profiteur
- profunctor-monad
- progress
- progress-meter
@ -9003,7 +9077,9 @@ broken-packages:
- prosidyc
- prosper
- proteaaudio
- proteaaudio-sdl
- proteome
- proto-lens-arbitrary
- proto-lens-combinators
- proto-lens-descriptors
- proto3-suite
@ -9012,6 +9088,7 @@ broken-packages:
- protocol-buffers-descriptor-fork
- protocol-buffers-fork
- protolude-lifted
- proton
- proton-haskell
- prototype
- prove-everywhere-server
@ -9043,6 +9120,7 @@ broken-packages:
- pure-io
- pure-priority-queue
- pure-priority-queue-tests
- pure-zlib
- purescheme-wai-routing-core
- purescript
- purescript-iso
@ -9112,6 +9190,7 @@ broken-packages:
- quickcheck-report
- quickcheck-state-machine
- quickcheck-state-machine-distributed
- quickcheck-string-random
- quickcheck-webdriver
- QuickCheckVariant
- QuickPlot
@ -9204,6 +9283,7 @@ broken-packages:
- raz
- razom-text-util
- rbr
- rbst
- rc
- rclient
- rdioh
@ -9277,6 +9357,7 @@ broken-packages:
- reflex-fsnotify
- reflex-gadt-api
- reflex-ghci
- reflex-gi-gtk
- reflex-gloss
- reflex-gloss-scene
- reflex-libtelnet
@ -9463,6 +9544,7 @@ broken-packages:
- roc-cluster-demo
- rock
- rocksdb-haskell
- rocksdb-query
- roku-api
- rollbar
- rollbar-cli
@ -9478,6 +9560,7 @@ broken-packages:
- rope
- rose-trees
- rose-trie
- rosebud
- roshask
- rosmsg
- rosmsg-bin
@ -9520,6 +9603,7 @@ broken-packages:
- runhs
- runmany
- runtime-arbitrary
- rv
- rws
- RxHaskell
- s-expression
@ -9627,6 +9711,7 @@ broken-packages:
- scp-streams
- scrabble-bot
- scrapbook
- scrapbook-core
- scrape-changes
- ScratchFs
- script-monad
@ -9694,6 +9779,7 @@ broken-packages:
- serv-wai
- servant-aeson-specs
- servant-auth-cookie
- servant-auth-docs
- servant-auth-hmac
- servant-auth-token
- servant-auth-token-acid
@ -9704,6 +9790,8 @@ broken-packages:
- servant-auth-wordpress
- servant-avro
- servant-cassava
- servant-checked-exceptions
- servant-checked-exceptions-core
- servant-cli
- servant-client-js
- servant-client-namedargs
@ -9711,6 +9799,7 @@ broken-packages:
- servant-db
- servant-db-postgresql
- servant-dhall
- servant-docs
- servant-docs-simple
- servant-ede
- servant-ekg
@ -9722,6 +9811,7 @@ broken-packages:
- servant-github
- servant-haxl-client
- servant-hmac-auth
- servant-http-streams
- servant-http2-client
- servant-iCalendar
- servant-jquery
@ -9730,6 +9820,7 @@ broken-packages:
- servant-kotlin
- servant-matrix-param
- servant-mock
- servant-multipart
- servant-namedargs
- servant-nix
- servant-openapi3
@ -9744,6 +9835,7 @@ broken-packages:
- servant-py
- servant-quickcheck
- servant-rawm-client
- servant-rawm-docs
- servant-reason
- servant-reflex
- servant-router
@ -9779,6 +9871,7 @@ broken-packages:
- Set
- set-of
- set-with
- setdown
- setgame
- setoid
- setters
@ -9839,7 +9932,10 @@ broken-packages:
- show-prettyprint
- showdown
- Shpadoinkle-backend-pardiff
- Shpadoinkle-backend-snabbdom
- Shpadoinkle-backend-static
- Shpadoinkle-developer-tools
- Shpadoinkle-disembodied
- Shpadoinkle-examples
- Shpadoinkle-html
- Shpadoinkle-router
@ -9852,6 +9948,7 @@ broken-packages:
- sifflet
- sifflet-lib
- sigma-ij
- sign
- signable
- signals
- signed-multiset
@ -9915,6 +10012,7 @@ broken-packages:
- sized-vector
- sizes
- sjsp
- SJW
- skeletal-set
- skeleton
- skeletons
@ -9938,6 +10036,7 @@ broken-packages:
- slot-lambda
- sloth
- slug
- slynx
- small-bytearray-builder
- smallarray
- smallcheck-kind-generics
@ -10004,6 +10103,7 @@ broken-packages:
- snaplet-mongodb-minimalistic
- snaplet-mysql-simple
- snaplet-oauth
- snaplet-persistent
- snaplet-postgresql-simple
- snaplet-postmark
- snaplet-purescript
@ -10125,6 +10225,7 @@ broken-packages:
- sql-simple-sqlite
- sqlcipher
- sqlite
- sqlite-simple-errors
- sqlite-simple-typed
- sqlvalue-list
- sqsd-local
@ -10156,6 +10257,7 @@ broken-packages:
- stack-run-auto
- stack-type
- stack-wrapper
- stack2cabal
- stack2nix
- stackage
- stackage-build-plan
@ -10256,6 +10358,7 @@ broken-packages:
- streaming-utils
- streaming-with
- streamly-archive
- streamly-lmdb
- streamproc
- strelka
- strict-base-types
@ -10267,10 +10370,12 @@ broken-packages:
- strictly
- string-isos
- string-quote
- string-random
- string-typelits
- stringlike
- stringtable-atom
- stripe
- stripe-hs
- stripe-http-streams
- stripe-scotty
- stripe-wreq
@ -10329,6 +10434,7 @@ broken-packages:
- svg2q
- svgcairo
- SVGFonts
- svgone
- svgutils
- svm-light-utils
- svm-simple
@ -10359,6 +10465,7 @@ broken-packages:
- symantic-http-server
- symantic-http-test
- symantic-lib
- symantic-parser
- symantic-xml
- symbiote
- symbolic-link
@ -10397,6 +10504,7 @@ broken-packages:
- t3-server
- ta
- table
- table-layout
- table-tennis
- tableaux
- Tables
@ -10445,6 +10553,7 @@ broken-packages:
- tasty-laws
- tasty-lens
- tasty-mgolden
- tasty-silver
- tasty-stats
- tateti-tateti
- Taxonomy
@ -10493,6 +10602,7 @@ broken-packages:
- tensorflow-logging
- tensorflow-opgen
- tensorflow-ops
- term-rewriting
- termbox-banana
- termbox-bindings
- terminal-text
@ -10582,9 +10692,9 @@ broken-packages:
- thih
- thimk
- Thingie
- thock
- thorn
- threadmanager
- threadscope
- threepenny-editors
- threepenny-gui-contextmenu
- threepenny-gui-flexbox
@ -10646,6 +10756,7 @@ broken-packages:
- tkhs
- tkyprof
- tls-extra
- tlynx
- tmp-postgres
- tn
- to-haskell
@ -10667,6 +10778,8 @@ broken-packages:
- tomato-rubato-openal
- toml
- tonatona-google-server-api
- tonatona-persistent-postgresql
- tonatona-persistent-sqlite
- tonatona-servant
- too-many-cells
- toodles
@ -10760,6 +10873,7 @@ broken-packages:
- tsvsql
- tsweb
- ttask
- ttn-client
- tttool
- tubes
- tuntap
@ -10888,15 +11002,25 @@ broken-packages:
- unicode-prelude
- unicode-show
- unicode-symbols
- unicode-tricks
- uniform-io
- union
- union-map
- uniprot-kb
- uniqueid
- uniquely-represented-sets
- units-attoparsec
- unittyped
- unitym-yesod
- universal-binary
- universe
- universe-base
- universe-dependent-sum
- universe-instances-base
- universe-instances-extended
- universe-instances-trans
- universe-reverse-instances
- universe-some
- universe-th
- unix-fcntl
- unix-handle
@ -11210,6 +11334,7 @@ broken-packages:
- whitespace
- whois
- why3
- wide-word
- WikimediaParser
- wikipedia4epub
- wild-bind-indicator
@ -11237,6 +11362,7 @@ broken-packages:
- woffex
- wol
- wolf
- word
- word2vec-model
- WordAlignment
- wordchoice
@ -11457,6 +11583,7 @@ broken-packages:
- yesod-mangopay
- yesod-markdown
- yesod-media-simple
- yesod-page-cursor
- yesod-paginate
- yesod-pagination
- yesod-paypal-rest
@ -11523,6 +11650,7 @@ broken-packages:
- yu-tool
- yu-utils
- yuuko
- yx
- yxdb-utils
- Z-Data
- Z-IO

13
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -94,16 +94,6 @@ self: super: builtins.intersectAttrs super {
# Won't find it's header files without help.
sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";
# profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
cachix = overrideSrc (disableLibraryProfiling super.cachix) {
src = (pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17";
sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g";
}) + "/cachix";
version = "0.5.1";
};
hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;
# avoid compiling twice by providing executable as a separate output (with small closure size)
@ -808,4 +798,7 @@ self: super: builtins.intersectAttrs super {
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
# waiting for https://github.com/haskell/ThreadScope/pull/115
threadscope = doJailbreak super.threadscope;
}

2026
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/haskell-modules/non-hackage-packages.nix
View File

@ -25,6 +25,8 @@ self: super: {
hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { };
hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { };
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };

4
pkgs/development/python-modules/awkward/default.nix
View File

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb";
sha256 = "3468cb80cab51252a1936e5e593c7df4588ea0e18dcb6fb31e3d2913ba883928";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/python-modules/msal/default.nix
View File

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msal";
version = "1.6.0";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9";
sha256 = "1dcc737ca517df53438bc9a3fae97f17d93d7a93fa1389e6bc44e82eee81ab83";
};
propagatedBuildInputs = [

35
pkgs/development/tools/haskell/haskell-language-server/default.nix
View File

@ -2,21 +2,23 @@
, bytestring, containers, data-default, deepseq, directory, extra
, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api
, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec
, hspec-core, lens, lsp-test, mtl, optparse-applicative
, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin
, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
, hls-tactics-plugin, hslogger, hspec, hspec-core
, hspec-expectations, lens, lsp-test, mtl, optparse-applicative
, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml
, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
, temporary, text, time, transformers, unordered-containers, yaml
, temporary, text, transformers, unordered-containers, with-utf8
, yaml
}:
mkDerivation {
pname = "haskell-language-server";
version = "0.7.1.0";
version = "0.8.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
isLibrary = true;
@ -29,19 +31,20 @@ mkDerivation {
executableHaskellDepends = [
aeson base binary brittany bytestring containers deepseq directory
extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin
hls-hlint-plugin hls-plugin-api hls-retrie-plugin
hls-tactics-plugin hslogger lens mtl optparse-applicative
optparse-simple ormolu process regex-tdfa safe-exceptions shake
stylish-haskell temporary text time transformers
unordered-containers
gitrev hashable haskell-lsp hie-bios hls-class-plugin
hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin
hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens
mtl optparse-applicative optparse-simple ormolu process regex-tdfa
safe-exceptions shake stylish-haskell temporary text transformers
unordered-containers with-utf8
];
testHaskellDepends = [
aeson base blaze-markup bytestring containers data-default
directory extra filepath haskell-lsp hie-bios hls-plugin-api
hslogger hspec hspec-core lens lsp-test process stm tasty
tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit
tasty-rerun temporary text transformers unordered-containers yaml
hslogger hspec hspec-core hspec-expectations lens lsp-test process
stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
tasty-hunit tasty-rerun temporary text transformers
unordered-containers yaml
];
testToolDepends = [ ghcide ];
homepage = "https://github.com/haskell/haskell-language-server#readme";

21
pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix Normal file
View File

@ -0,0 +1,21 @@
{ mkDerivation, aeson, base, containers, fetchgit, ghc
, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
, stdenv, text, transformers, unordered-containers
}:
mkDerivation {
pname = "hls-class-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers ghc ghc-exactprint ghcide haskell-lsp
hls-plugin-api lens shake text transformers unordered-containers
];
description = "Explicit imports plugin for Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

27
pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix Normal file
View File

@ -0,0 +1,27 @@
{ mkDerivation, aeson, base, containers, deepseq, Diff, directory
, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
, parser-combinators, pretty-simple, QuickCheck, safe-exceptions
, shake, stdenv, temporary, text, time, transformers
, unordered-containers
}:
mkDerivation {
pname = "hls-eval-plugin";
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
aeson base containers deepseq Diff directory extra filepath ghc
ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
hls-plugin-api parser-combinators pretty-simple QuickCheck
safe-exceptions shake temporary text time transformers
unordered-containers
];
description = "Eval plugin for Haskell Language Server";
license = stdenv.lib.licenses.asl20;
}

4
pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix
View File

@ -7,8 +7,8 @@ mkDerivation {
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";

4
pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix
View File

@ -10,8 +10,8 @@ mkDerivation {
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";

4
pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix
View File

@ -8,8 +8,8 @@ mkDerivation {
version = "0.1.0.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";

4
pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix
View File

@ -10,8 +10,8 @@ mkDerivation {
version = "0.5.1.0";
src = fetchgit {
url = "https://github.com/haskell/haskell-language-server.git";
sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa";
rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c";
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
fetchSubmodules = true;
};
postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";

7
pkgs/development/tools/haskell/haskell-language-server/update.sh
View File

@ -41,11 +41,10 @@ hls_new_version=$hls_latest_release
echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix"
cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix"
for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do
cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix"
done
echo "Finished."

41
pkgs/development/tools/purescript/spago/spago.nix
View File

@ -1,35 +1,36 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool
, base, bower-json, bytestring, Cabal, containers, dhall, directory
, either, exceptions, extra, fetchgit, file-embed, filepath, foldl
, fsnotify, generic-lens, github, Glob, hpack, hspec
, hspec-discover, hspec-megaparsec, http-client, http-conduit
, http-types, lens-family-core, megaparsec, mtl, network-uri
, open-browser, optparse-applicative, prettyprinter, process
, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv
, stm, stringsearch, tar, template-haskell, temporary, text, time
, transformers, turtle, unliftio, unordered-containers, utf8-string
, vector, versions, with-utf8, zlib
, base, bower-json, bytestring, Cabal, containers, cryptonite
, dhall, directory, either, exceptions, extra, fetchgit, file-embed
, filepath, foldl, fsnotify, generic-lens, github, Glob, hpack
, hspec, hspec-discover, hspec-megaparsec, http-client
, http-conduit, http-types, lens-family-core, megaparsec, mtl
, network-uri, open-browser, optparse-applicative, prettyprinter
, process, QuickCheck, retry, rio, rio-orphans, safe, semver-range
, stdenv, stm, stringsearch, tar, template-haskell, temporary, text
, time, transformers, turtle, unliftio, unordered-containers
, utf8-string, vector, versions, with-utf8, zlib
}:
mkDerivation {
pname = "spago";
version = "0.18.0";
version = "0.19.0";
src = fetchgit {
url = "https://github.com/purescript/spago.git";
sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38";
rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2";
sha256 = "182a9pkv64rbyqrig470cmql4ingf5vpxh11xkxqq2baxym3vwip";
rev = "960a310d6efca3bb40009eb06d88382e4670ccef";
fetchSubmodules = true;
};
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async-pool base bower-json
bytestring Cabal containers dhall directory either exceptions
file-embed filepath foldl fsnotify generic-lens github Glob
http-client http-conduit http-types lens-family-core megaparsec mtl
network-uri open-browser optparse-applicative prettyprinter process
retry rio rio-orphans safe semver-range stm stringsearch tar
template-haskell temporary text time transformers turtle unliftio
unordered-containers utf8-string vector versions with-utf8 zlib
bytestring Cabal containers cryptonite dhall directory either
exceptions file-embed filepath foldl fsnotify generic-lens github
Glob http-client http-conduit http-types lens-family-core
megaparsec mtl network-uri open-browser optparse-applicative
prettyprinter process retry rio rio-orphans safe semver-range stm
stringsearch tar template-haskell temporary text time transformers
turtle unliftio unordered-containers utf8-string vector versions
with-utf8 zlib
];
libraryToolDepends = [ hpack ];
executableHaskellDepends = [ base text turtle with-utf8 ];

44
pkgs/games/ckan/default.nix
View File

@ -1,44 +1,34 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }:
{ stdenv, fetchurl, makeWrapper, mono, gtk2, curl }:
stdenv.mkDerivation rec {
pname = "ckan";
version = "1.16.1";
version = "1.29.2";
src = fetchFromGitHub {
owner = "KSP-CKAN";
repo = "CKAN";
rev = "v${version}";
sha256 = "0lfvl8w09lakz35szp5grfvhq8xx486f5igvj1m6azsql4n929lg";
src = fetchurl {
url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
sha256 = "10vd61mw2y7vmbnp6nd7b2sq22ixqd7zmd278z210w4njmvqn97h";
};
buildInputs = [ makeWrapper perl mono ];
dontUnpack = true;
postPatch = ''
substituteInPlace bin/build \
--replace /usr/bin/perl ${perl}/bin/perl
'';
# Tests don't currently work, as they try to write into /var/empty.
doCheck = false;
checkTarget = "test";
buildInputs = [ makeWrapper mono ];
libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ];
buildPhase = "true";
installPhase = ''
mkdir -p $out/bin
for exe in *.exe; do
install -m 0644 $exe $out/bin
makeWrapper ${mono}/bin/mono $out/bin/$(basename $exe .exe) \
--add-flags $out/bin/$exe \
--set LD_LIBRARY_PATH $libraries
done
install -m 644 -D $src $out/bin/ckan.exe
makeWrapper ${mono}/bin/mono $out/bin/ckan \
--add-flags $out/bin/ckan.exe \
--set LD_LIBRARY_PATH $libraries
'';
meta = {
meta = with stdenv.lib; {
description = "Mod manager for Kerbal Space Program";
homepage = "https://github.com/KSP-CKAN/CKAN";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.Baughn ];
platforms = stdenv.lib.platforms.all;
license = licenses.mit;
maintainers = with maintainers; [ Baughn ymarkus ];
platforms = platforms.all;
};
}

6
pkgs/os-specific/linux/kernel/linux-lqx.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
let
version = "5.9.16";
version = "5.10.5";
in
buildLinux (args // {
@ -13,11 +13,11 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-lqx1";
sha256 = "0ljvqf91nxpql98z75bicg5y3nzkm41rq5b0rm1kcnsk0ji829ps";
sha256 = "1qnxmxahx1wpwhpjz6gdm5zdy1gd8ic3p7vqbz55vx4ygn865gyv";
};
extraMeta = {
branch = "5.9/master";
branch = "5.10/master";
maintainers = with stdenv.lib.maintainers; [ atemu ];
description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
};

4
pkgs/servers/metabase/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
version = "0.37.4";
version = "0.37.5";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
sha256 = "0l781b7mc33kkp4ic57ylghxw671b4ldv6b0wgphmrrwmp0cd3vm";
sha256 = "1wvq5nx3y28w8wn6wyy650gc32hgkx7inbcylrdirhagzqhcm8z6";
};
nativeBuildInputs = [ makeWrapper ];

53
pkgs/tools/admin/amazon-ec2-utils/default.nix Normal file
View File

@ -0,0 +1,53 @@
{ stdenv
, lib
, fetchFromGitHub
, curl
, python3
}:
stdenv.mkDerivation rec {
pname = "amazon-ec2-utils";
version = "1.3";
src = fetchFromGitHub {
owner = "aws";
repo = "amazon-ec2-utils";
rev = version;
hash = "sha256:04dpxaaca144a74r6d93q4lp0d5l32v07rldj7v2v1c6s9nsf4mv";
};
buildInputs = [
python3
];
propagatedBuildInputs = [
curl
];
installPhase = ''
mkdir -p $out/bin/
cp ebsnvme-id $out/bin/
cp ec2-metadata $out/bin/
cp ec2udev-vbd $out/bin/
cp ec2udev-vcpu $out/bin/
chmod +x $out/bin/*
'';
doInstallCheck = true;
# We cannot run
# ec2-metadata --help
# because it actually checks EC2 metadata even if --help is given
# so it won't work in the test sandbox.
installCheckPhase = ''
$out/bin/ebsnvme-id --help
'';
meta = with lib; {
homepage = "https://github.com/aws/amazon-ec2-utils";
description = "Contains a set of utilities and settings for Linux deployments in EC2";
license = licenses.mit;
maintainers = with maintainers; [ ketzacoatl ];
};
}

130
pkgs/tools/admin/pulumi/data.nix
View File

@ -1,60 +1,60 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "2.15.0";
version = "2.17.0";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-linux-x64.tar.gz";
sha256 = "0yvzqqcfmgblig5jwdc07phyhnfjzvjd1qm0vgfi9ll9y88l33lc";
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-linux-x64.tar.gz";
sha256 = "0k2vdgyb75krjqb9kikkfpvd6rn90gm6dzbpgzsycrwrmbx3rk79";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-linux-amd64.tar.gz";
sha256 = "1rpmzra42kx2jnhdbnqg120lbnpw86y00vkqbqc3qyagi260f01g";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-linux-amd64.tar.gz";
sha256 = "0qghccr8kj21scsil4ibc19y3sgrsyzs5c04a5ppv1k62y89h7m7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-linux-amd64.tar.gz";
sha256 = "0y0j1aflrfas9sfr4g7jbn2cnhlz9hpz5il6qykz0m01v6sv604w";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-linux-amd64.tar.gz";
sha256 = "125jqdjn9iipnjj3xgwvcfhcq0xi8xvn8mgs17g79xwbbxpvrjiv";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-linux-amd64.tar.gz";
sha256 = "174b6r2vhbf9svknidd05sccjzihp97wcd8jwy6dll83d8f8v2xn";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-linux-amd64.tar.gz";
sha256 = "14pdsvgd512qflvkc1890q9wrri2rrcjdjw5n9lf2qb2m7wvns4y";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz";
sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-linux-amd64.tar.gz";
sha256 = "0p2i0k0js3js35jcphf64rzxs7zg9wq25yfzd9q6b2kp2vyqbvjs";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-linux-amd64.tar.gz";
sha256 = "0vj9674msiadnhmcypqv3dvhkl60sms9frjzpf4hnhlimxc9fpdd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-linux-amd64.tar.gz";
sha256 = "1hzf4668sljy2g6s9xz6lvn8cbjy8bb2flhdmc4ln69xxcsslj9z";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-linux-amd64.tar.gz";
sha256 = "1qipbpp74690w7n42dfsp8524gdjvm8z5665rmsy7mbdi2bd2x5v";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-linux-amd64.tar.gz";
sha256 = "0fr8ac7864ph02hhl3f08xjyk626c4zbcf8nr7xhmh2ifz6sj9sl";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-linux-amd64.tar.gz";
sha256 = "0khbcgqbssndx8fwb34ny0wcpy3xi165lq8dq224q1f9bjbklbml";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-linux-amd64.tar.gz";
sha256 = "0zx9yy97n0wk87ylgq67nphagfp1gas5z99mcfmlh9rf4mj8fhpz";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-linux-amd64.tar.gz";
sha256 = "13x9yxfyx65pqgsnpdfi12z6fg3b50fzkmsffvwi80857z2389rg";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-linux-amd64.tar.gz";
sha256 = "02c0nmnk27q9ssv7wv8s30ysxnkqbq7sd004gia4wxf97fhlhl5x";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-linux-amd64.tar.gz";
sha256 = "1s8g32d06dfaayjhga3skdh7vsrv5ysmhz6ygg202pqqpiy27vl5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-linux-amd64.tar.gz";
sha256 = "01rpv9m6mj8yqz302g15x4yp37pp4ghdc686n4l7xz08xdb209xi";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-linux-amd64.tar.gz";
sha256 = "0diylv5kbxjhwvwmwil6l8ln9lijmjnxwgf4yd0rhad118zpibnp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-linux-amd64.tar.gz";
sha256 = "1w4cjgccm29ncqb7jfsf9ajlvq0q8h5mnz4v5lxwyx21n80kq34p";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-linux-amd64.tar.gz";
sha256 = "1851nx4mmgc2j4jihcqxlx5c5dx95xbc2h0kxr055zvdfg2wcp8i";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-linux-amd64.tar.gz";
sha256 = "0imqwx4v6qsk10anxvnaxpxg87mm34x0qcq30c435mcfrly728sp";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-linux-amd64.tar.gz";
sha256 = "0f90v8q00hhqrnmwa17gl9sas61bzqsgblpaw1p48agnjxa76vnz";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz";
@ -65,8 +65,8 @@
sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-linux-amd64.tar.gz";
sha256 = "1vqzl72q939i381vy6dkn75xv09vjs2mg2prbmx63j3hylgb9m6r";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-linux-amd64.tar.gz";
sha256 = "16mq1ymvkql3l6f3rsinm4yfxfl9qcpwfmhc8k1vj79h6gkd29cz";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz";
@ -77,70 +77,70 @@
sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-linux-amd64.tar.gz";
sha256 = "02xq4mph35fnziz6fb230cvd828yfs030nmi3a4hwh4w1xbr24iw";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-linux-amd64.tar.gz";
sha256 = "1q8ifm8xmny04y38bswclaa065x657sjq9b573fxrnv9gv9nx5sy";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-linux-amd64.tar.gz";
sha256 = "0avlf8gyh52zc11a87izy2v8iy4zvbfv6zrm8zg1i5ar43xqg3pm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-linux-amd64.tar.gz";
sha256 = "047izxnmsykmk3dpm2q4zxhi575hiqlb1l7xx6sy43dh6ink16jb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-linux-amd64.tar.gz";
sha256 = "1wb953vm990c4dsb757msmz7ws844alad3g68sfy029cgmnf8q5i";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-linux-amd64.tar.gz";
sha256 = "1g32kjvh7zp6f4n4qy457s45qf9ddrzyd5ncfdvpsd0dirjf4crg";
}
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-darwin-x64.tar.gz";
sha256 = "08hyk06qwm1aibpyqb07h83gc6nfp0cwf6hikf8mc18b2mrwr27r";
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.17.0-darwin-x64.tar.gz";
sha256 = "0pa1a4j977cn3m43zia75aj4g5bqr69n0a4hha72dbnnid4d72g8";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-darwin-amd64.tar.gz";
sha256 = "0ih9l3pkqxfslc11qcgwshxqxbcwy5wfpjczahny6mkgqwmxixnx";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.1-darwin-amd64.tar.gz";
sha256 = "1q3r1a3wqzaw78abiz97364a9qgr3rr1m83kyjni3jhs5cgxbax0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-darwin-amd64.tar.gz";
sha256 = "0yqm66av2yb9qndpkxxisjml66dyg3zhzkb9fr6kywx8xar4gfdp";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.23.0-darwin-amd64.tar.gz";
sha256 = "0h4g49zr6gxvyavd9pzvlmnzxjqnnzh27dhz6007c10rgn894yba";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-darwin-amd64.tar.gz";
sha256 = "02is7mfbzhv8bkyn4vk1x9b6m1v9c21chihpry6cjdhpq46bfssf";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.0-darwin-amd64.tar.gz";
sha256 = "0k1azgpkrqbr4482h5v2w5qnavmgl5vnx0my2wsgzkwg5pv2i1ky";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz";
sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-darwin-amd64.tar.gz";
sha256 = "1r0r6hpchkiq6bg3z6bqnqqz8s96pijsp6rn1dby9f2kaqmar23c";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.14.0-darwin-amd64.tar.gz";
sha256 = "08clh3nnb32gzvnghk5w9m04jh3nn3svy4qx0hfidj3ci0dz6ncl";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-darwin-amd64.tar.gz";
sha256 = "1nrj3lh2asw6169pddjp83q6ll3w5fjp854bdrx99zajpv7gd0gm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.2.0-darwin-amd64.tar.gz";
sha256 = "01z8hwlw5i19rpcjk03iw12q2j9xy5in60d6y70v2n4nsmpqhlmq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-darwin-amd64.tar.gz";
sha256 = "0y76cy3h0n004lfch37gf9vi8glxnxixwmf1zby3izxd34pyri17";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.6.0-darwin-amd64.tar.gz";
sha256 = "04d3gn89kn7q494g7j6wz3ivmqkdk12l0i2lsmwqlmn3jra44wnd";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-darwin-amd64.tar.gz";
sha256 = "09zc0sg2h07c97bqbh3ma4pgs232nbd0q5l43992nqa4mn5b8w14";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.6.1-darwin-amd64.tar.gz";
sha256 = "1jxxm8iq1cnym45c8g2js731xz1xwgg72gfxryvy8i7faq6cxakq";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-darwin-amd64.tar.gz";
sha256 = "08crawyaa26llqc3hj2grba0546ny8zwj8dfg6i46ad3kx1nmycq";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.4.1-darwin-amd64.tar.gz";
sha256 = "17pyiknkjnqlh3cyvclbzg60qf8qig4rp4b0d97vhx8njb5ia9z5";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-darwin-amd64.tar.gz";
sha256 = "12ny0kmly1blj8hd8dlzqbg1pbfh37259x3k2kxx2zcqvcw9y4z9";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.4.0-darwin-amd64.tar.gz";
sha256 = "01vpfn62gnklamn2s17icdvzl25d9d97g0mdz955vwqhjsx7man3";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-darwin-amd64.tar.gz";
sha256 = "0svbnv3axy397w2hi3g1mghcahq88aj4jsnipn3lyxrm29n4wna7";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.1-darwin-amd64.tar.gz";
sha256 = "0552wdbykypaafyacjfwqc4sfsl87pgayrnkwg1km00mb1dknzl9";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-darwin-amd64.tar.gz";
sha256 = "1viwi0ji1qqy4ysl4a9dhv8sfpg8sp3w4i9ndvxs2m7zq0hbndbs";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.5-darwin-amd64.tar.gz";
sha256 = "0lhvv5d2v21b0sqcy6wabjlqwg9qx9gxbysnkx3c5f5iwk1hrj8g";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz";
@ -151,8 +151,8 @@
sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-darwin-amd64.tar.gz";
sha256 = "0dhxhsjb3vbc1bq4pgidadiyfr3gasj0h344prcjzcaxymb3609f";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.10.1-darwin-amd64.tar.gz";
sha256 = "0s6iaqn1jfm7glfnmdps6rk4iqrq2xspmbn4dmqj6q9w9ig1wab6";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz";
@ -163,16 +163,16 @@
sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-darwin-amd64.tar.gz";
sha256 = "0f77ja9cvhcl86654a3gmb399c7ybigznmxxd8f6f2m7x44pih4q";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.0-darwin-amd64.tar.gz";
sha256 = "192a9zkc0yz44jzx3b7xcfy1xdw2blfsmqqvy7dqjhg029nfjfzp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-darwin-amd64.tar.gz";
sha256 = "18i81mdws02kfil8zcrnjl3i4gjxqix9n04flz67mqw730mhr3ss";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.2.0-darwin-amd64.tar.gz";
sha256 = "1x5avdbfsrxs98lz20vyl1vyz2dnkz6cdix3yqm4nnyllin34pps";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-darwin-amd64.tar.gz";
sha256 = "1mw70j1iky98k09739mq1b7lsarvlqp2kcm26555520z78ifiibh";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.3-darwin-amd64.tar.gz";
sha256 = "1hzcy1mxvcv9nm5jf6dy96ha3f29kcnbidfw01qc4smy8hc40f66";
}
];
};

32
pkgs/tools/admin/pulumi/update.sh
View File

@ -3,31 +3,31 @@
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="2.15.0"
VERSION="2.17.0"
# Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases
plugins=(
"auth0=1.3.0"
"aws=3.19.0"
"cloudflare=2.8.0"
"auth0=1.5.1"
"aws=3.23.0"
"cloudflare=2.11.0"
"consul=2.6.2"
"datadog=2.11.0"
"digitalocean=3.1.1"
"docker=2.4.1"
"gcp=4.4.0"
"github=2.3.0"
"gitlab=3.3.0"
"hcloud=0.4.0"
"kubernetes=2.7.3"
"datadog=2.14.0"
"digitalocean=3.2.0"
"docker=2.6.0"
"gcp=4.6.1"
"github=2.4.1"
"gitlab=3.4.0"
"hcloud=0.4.1"
"kubernetes=2.7.5"
"mailgun=2.3.1"
"mysql=2.3.2"
"openstack=2.9.0"
"openstack=2.10.1"
"packet=3.2.2"
"postgresql=2.5.2"
"random=2.4.2"
"vault=3.1.0"
"vsphere=2.11.2"
"random=3.0.0"
"vault=3.2.0"
"vsphere=2.11.3"
);
function genMainSrc() {

2
pkgs/tools/package-management/conda/default.nix
View File

@ -62,6 +62,8 @@ in
export FONTCONFIG_FILE=/etc/fonts/fonts.conf
export QTCOMPOSE=${xorg.libX11}/share/X11/locale
export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so
# Allows `conda activate` to work properly
source ${installationPath}/etc/profile.d/conda.sh
'';
meta = {

34
pkgs/tools/system/autocpu-freq/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonPackage rec {
pname = "auto-cpufreq";
version = "1.5.1";
src = fetchFromGitHub {
owner = "AdnanHodzic";
repo = pname;
rev = "v${version}";
sha256 = "uVhftO6AqFnZ0uaEYRAPvVskkouNOXPtNVYXx7WJKyw=";
};
propagatedBuildInputs = with python3Packages; [ click distro psutil ];
doCheck = false;
pythonImportsCheck = [ "source" ];
# patch to prevent script copying and to disable install
patches = [ ./prevent-install-and-copy.patch ];
postInstall = ''
# copy script manually
cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl
'';
meta = with stdenv.lib; {
homepage = "https://github.com/AdnanHodzic/auto-cpufreq";
description = "Automatic CPU speed & power optimizer for Linux";
license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.Technical27 ];
};
}

178
pkgs/tools/system/autocpu-freq/prevent-install-and-copy.patch Normal file
View File

@ -0,0 +1,178 @@
diff --git a/scripts/cpufreqctl.sh b/scripts/cpufreqctl.sh
index 63a2b5b..e157efe 100755
--- a/scripts/cpufreqctl.sh
+++ b/scripts/cpufreqctl.sh
@@ -467,35 +467,21 @@ fi
if [ $OPTION = "--install" ]
then
- echo 'installing helpers...'
- cp $0 /usr/bin/
- echo 'installing policy...'
- cp $(dirname "$(readlink -f "$0")")/konkor.cpufreq.policy /usr/share/polkit-1/actions/
- echo 'installing fonts...'
- mkdir -p /usr/share/fonts/truetype/cpufreq
- cp $(dirname "$(readlink -f "$0")")/fonts/cpufreq.ttf /usr/share/fonts/truetype/cpufreq/
- echo "done"
+ echo "install is disabled in the nix package"
exit
fi
if [ $OPTION = "--update-fonts" ]
then
- fc-cache -f
+ echo "update-fonts is disabled in the nix package"
exit
fi
if [ $OPTION = "--uninstall" ]
then
- echo 'uninstalling cpufreqctl helper...'
- rm /usr/bin/cpufreqctl
- echo 'uninstalling policy...'
- rm /usr/share/polkit-1/actions/konkor.cpufreq.policy
- echo 'uninstalling fonts...'
- rm -rf /usr/share/fonts/truetype/cpufreq
- echo "done"
+ echo "uninstall is disabled in the nix package"
exit
fi
if [ $OPTION = "--reset" ]
then
- echo 'reset to default values...'
- dconf reset -f "/org/gnome/shell/extensions/cpufreq/"
+ echo "reset is disabled in the nix package"
exit
fi
diff --git a/source/core.py b/source/core.py
index 531c0c4..2e27e65 100644
--- a/source/core.py
+++ b/source/core.py
@@ -24,8 +24,6 @@ warnings.filterwarnings("ignore")
# - re-enable CPU fan speed display and make more generic and not only for thinkpad
# - replace get system/CPU load from: psutil.getloadavg() | available in 5.6.2)
-SCRIPTS_DIR = Path("/usr/local/share/auto-cpufreq/scripts/")
-
# from the highest performance to the lowest
ALL_GOVERNORS = ("performance", "ondemand", "conservative", "schedutil", "userspace", "powersave")
CPUS = os.cpu_count()
@@ -156,34 +154,16 @@ def cpufreqctl():
"""
deploy cpufreqctl script
"""
-
- # detect if running on a SNAP
- if os.getenv('PKG_MARKER') == "SNAP":
- pass
- else:
- # deploy cpufreqctl script (if missing)
- if os.path.isfile("/usr/bin/cpufreqctl"):
- shutil.copy("/usr/bin/cpufreqctl", "/usr/bin/cpufreqctl.auto-cpufreq.bak")
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl")
- else:
- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/bin/cpufreqctl")
+ # scripts are already in the correct place
+ pass
def cpufreqctl_restore():
"""
restore original cpufreqctl script
"""
- # detect if running on a SNAP
- if os.getenv('PKG_MARKER') == "SNAP":
- pass
- else:
- # restore original cpufreqctl script
- if os.path.isfile("/usr/bin/cpufreqctl.auto-cpufreq.bak"):
- os.system("cp /usr/bin/cpufreqctl.auto-cpufreq.bak /usr/bin/cpufreqctl")
- os.remove("/usr/bin/cpufreqctl.auto-cpufreq.bak")
- # ToDo: implement mechanism to make sure cpufreqctl (auto-cpufreq) file is
- # restored if overwritten by system. But during tool removal to also remove it
- # in def cpufreqctl
+ # no need to restore
+ pass
def footer(l=79):
@@ -209,71 +189,13 @@ def remove_complete_msg():
def deploy_daemon():
- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n")
-
- # deploy cpufreqctl script func call
- cpufreqctl()
-
- print("* Turn off bluetooth on boot")
- btconf = Path("/etc/bluetooth/main.conf")
- try:
- orig_set = "AutoEnable=true"
- change_set = "AutoEnable=false"
- with btconf.open(mode="r+") as f:
- content = f.read()
- f.seek(0)
- f.truncate()
- f.write(content.replace(orig_set, change_set))
- except:
- print("\nERROR:\nWas unable to turn off bluetooth on boot")
-
- auto_cpufreq_log_file.touch(exist_ok=True)
-
- print("\n* Deploy auto-cpufreq install script")
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/bin/auto-cpufreq-install")
-
- print("\n* Deploy auto-cpufreq remove script")
- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/bin/auto-cpufreq-remove")
-
- call("/usr/bin/auto-cpufreq-install", shell=True)
+ # prevent needless copying and system changes
+ pass
# remove auto-cpufreq daemon
def remove():
-
- # check if auto-cpufreq is installed
- if not os.path.exists("/usr/bin/auto-cpufreq-remove"):
- print("\nauto-cpufreq daemon is not installed.\n")
- sys.exit(1)
-
- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n")
-
- print("* Turn on bluetooth on boot")
- btconf = "/etc/bluetooth/main.conf"
- try:
- orig_set = "AutoEnable=true"
- change_set = "AutoEnable=false"
- with open(btconf, "r+") as f:
- content = f.read()
- f.seek(0)
- f.truncate()
- f.write(content.replace(change_set, orig_set))
- except:
- print("\nERROR:\nWas unable to turn on bluetooth on boot")
-
- # run auto-cpufreq daemon install script
- call("/usr/bin/auto-cpufreq-remove", shell=True)
-
- # remove auto-cpufreq-remove
- os.remove("/usr/bin/auto-cpufreq-remove")
-
- # delete log file
- if auto_cpufreq_log_file.exists():
- auto_cpufreq_log_file.unlink()
-
- # restore original cpufrectl script
- cpufreqctl_restore()
-
+ pass
def gov_check():
for gov in get_avail_gov():
@@ -798,4 +720,4 @@ def running_daemon():
exit(1)
elif os.getenv("PKG_MARKER") == "SNAP" and dcheck == "enabled":
deploy_complete_msg()
- exit(1)
\ No newline at end of file
+ exit(1)

6
pkgs/top-level/all-packages.nix
View File

@ -831,6 +831,8 @@ in
alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { };
amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
amber = callPackage ../tools/text/amber {
@ -25772,6 +25774,8 @@ in
lnd = callPackage ../applications/blockchains/lnd.nix { };
lndconnect = callPackage ../applications/blockchains/lndconnect { };
monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost17x;
@ -28821,6 +28825,8 @@ in
ssh-audit = callPackage ../tools/security/ssh-audit { };
autocpu-freq = callPackage ../tools/system/autocpu-freq { };
thermald = callPackage ../tools/system/thermald { };
throttled = callPackage ../tools/system/throttled { };