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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-05 06:01:16 +00:00 committed by GitHub
commit 4b70e0e343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 830 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
nixos/modules/services/networking/adguardhome.nix
View File

@ -10,12 +10,20 @@ let
"--pidfile /run/AdGuardHome/AdGuardHome.pid"
"--work-dir /var/lib/AdGuardHome/"
"--config /var/lib/AdGuardHome/AdGuardHome.yaml"
"--host ${cfg.host}"
"--port ${toString cfg.port}"
] ++ cfg.extraArgs);
in
{
baseConfig = {
bind_host = cfg.host;
bind_port = cfg.port;
};
configFile = pkgs.writeTextFile {
name = "AdGuardHome.yaml";
text = builtins.toJSON (recursiveUpdate cfg.settings baseConfig);
checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config";
};
in {
options.services.adguardhome = with types; {
enable = mkEnableOption "AdGuard Home network-wide ad blocker";
@ -44,6 +52,31 @@ in
'';
};
mutableSettings = mkOption {
default = true;
type = bool;
description = ''
Allow changes made on the AdGuard Home web interface to persist between
service restarts.
'';
};
settings = mkOption {
type = (pkgs.formats.yaml { }).type;
default = { };
description = ''
AdGuard Home configuration. Refer to
<link xlink:href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#configuration-file"/>
for details on supported values.
<note><para>
On start and if <option>mutableSettings</option> is <literal>true</literal>,
these options are merged into the configuration file on start, taking
precedence over configuration changes made on the web interface.
</para></note>
'';
};
extraArgs = mkOption {
default = [ ];
type = listOf str;
@ -62,6 +95,19 @@ in
StartLimitIntervalSec = 5;
StartLimitBurst = 10;
};
preStart = ''
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
&& [ "${toString cfg.mutableSettings}" = "1" ]; then
# Writing directly to AdGuardHome.yaml results in empty file
${pkgs.yaml-merge}/bin/yaml-merge "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
else
cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml"
fi
'';
serviceConfig = {
DynamicUser = true;
ExecStart = "${pkgs.adguardhome}/bin/adguardhome ${args}";

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"commit": "01a23b49c333c95167338433cd375e24fc60d66d",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/01a23b49c333c95167338433cd375e24fc60d66d.tar.gz",
"sha256": "0mf1pqlg5cj0p0si1vgf5mp5an89yhq0il6v7n58smcqbfdynds5",
"msg": "Update from Hackage at 2021-12-21T13:58:08Z"
"commit": "f1cca49c3c22107b73ce7156ebc7735d7d8d250e",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f1cca49c3c22107b73ce7156ebc7735d7d8d250e.tar.gz",
"sha256": "0bcfynix3y0w5fhrij241l6sbndfr5h20pnxwqb9sf4h2ag0zlsa",
"msg": "Update from Hackage at 2021-12-28T00:33:48Z"
}

2
pkgs/development/compilers/ghc/8.10.7.nix
View File

@ -57,7 +57,7 @@
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
disableLargeAddressSpace ? stdenv.targetPlatform.isiOS
}:
assert !enableIntegerSimple -> gmp != null;

2
pkgs/development/compilers/ghc/8.8.4.nix
View File

@ -56,7 +56,7 @@
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
disableLargeAddressSpace ? stdenv.targetPlatform.isiOS
}:
assert !enableIntegerSimple -> gmp != null;

12
pkgs/development/compilers/ghc/9.0.1.nix → pkgs/development/compilers/ghc/9.0.2.nix
View File

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr
, autoSignDarwinBinariesHook
, bash
@ -58,7 +58,7 @@
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
disableLargeAddressSpace ? stdenv.targetPlatform.isiOS
}:
assert !enableIntegerSimple -> gmp != null;
@ -165,12 +165,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
stdenv.mkDerivation (rec {
version = "9.0.1";
version = "9.0.2";
pname = "${targetPrefix}ghc${variantSuffix}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5";
sha256 = "140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197";
};
enableParallelBuilding = true;
@ -280,6 +280,10 @@ stdenv.mkDerivation (rec {
autoSignDarwinBinariesHook
] ++ lib.optionals enableDocs [
sphinx
] ++ lib.optionals stdenv.isDarwin [
# TODO(@sternenseemann): backport addition of XATTR env var like
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
xattr
];
# For building runtime libs

2
pkgs/development/compilers/ghc/9.2.1.nix
View File

@ -59,7 +59,7 @@
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
disableLargeAddressSpace ? stdenv.targetPlatform.isiOS
}:
assert !enableIntegerSimple -> gmp != null;

2
pkgs/development/compilers/ghc/head.nix
View File

@ -64,7 +64,7 @@
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
disableLargeAddressSpace ? stdenv.targetPlatform.isiOS
}:
assert !enableNativeBignum -> gmp != null;

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

@ -2032,19 +2032,6 @@ self: super: {
assert pkgs.lib.versionOlder self.hspec.version "2.8.2";
doJailbreak super.graphql;
# gtk2hsC2hs fails to build on certain architectures (aarch64, ppc64(le), ...)
# with a linker error. As a workaround, we build gtk2hs-buildtools with -O0
# as suggested in the GHC thread below. An alternative to this could be to use
# -fllvm. I haven't been able to get this to work without linker errors, though.
# See also:
# * https://gitlab.haskell.org/ghc/ghc/-/issues/17203
# * https://github.com/gtk2hs/gtk2hs/issues/305
# * https://github.com/gtk2hs/gtk2hs/issues/279
gtk2hs-buildtools = appendConfigureFlags
(pkgs.lib.optionals (with pkgs.stdenv.hostPlatform; isAarch64 || isPowerPC) [
"--ghc-option=-O0"
]) super.gtk2hs-buildtools;
# https://github.com/ajscholl/basic-cpuid/pull/1
basic-cpuid = appendPatch (pkgs.fetchpatch {
url = "https://github.com/ajscholl/basic-cpuid/commit/2f2bd7a7b53103fb0cf26883f094db9d7659887c.patch";
@ -2254,4 +2241,13 @@ self: super: {
sdp4unordered = disableLibraryProfiling super.sdp4unordered;
sdp4vector = disableLibraryProfiling super.sdp4vector;
hie-bios = appendPatches [
# Accounts for a breaking change in GHC 9.0.2 via CPP
(pkgs.fetchpatch {
name = "hie-bios-ghc-9.0.2-compat.patch";
url = "https://github.com/haskell/hie-bios/commit/da0cb23384cc6e9b393792f8f25a3c174a4edafa.patch";
sha256 = "1qj67s93h6pxvdapw1sxy6izwp5y8vjaw67gw3lsnj8gs14fqq4h";
})
] super.hie-bios;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

24
pkgs/development/haskell-modules/configuration-darwin.nix
View File

@ -256,6 +256,30 @@ self: super: ({
] ++ (drv.libraryFrameworkDepends or []);
}) super.streamly_0_8_1_1;
http-client-tls = overrideCabal (drv: {
postPatch = ''
# This comment has been inserted, so the derivation hash changes, forcing
# a rebuild of this derivation which has succeeded to build on Hydra before,
# but apparently been corrupted, causing reverse dependencies to fail.
#
# This workaround can be removed upon the next darwin stdenv rebuild,
# presumably https://github.com/NixOS/nixpkgs/pull/152850 or the next
# full haskellPackages rebuild.
'' + drv.postPatch or "";
}) super.http-client-tls;
foldl = overrideCabal (drv: {
postPatch = ''
# This comment has been inserted, so the derivation hash changes, forcing
# a rebuild of this derivation which has succeeded to build on Hydra before,
# but apparently been corrupted, causing reverse dependencies to fail.
#
# This workaround can be removed upon the next darwin stdenv rebuild,
# presumably https://github.com/NixOS/nixpkgs/pull/152850 or the next
# full haskellPackages rebuild.
'' + drv.postPatch or "";
}) super.foldl;
} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin
# https://github.com/fpco/unliftio/issues/87

6
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -121,9 +121,9 @@ self: super: {
# 2021-09-18: ghc-api-compat and ghc-lib-* need >= 9.0.x versions for hls and hlint
ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1;
ghc-lib-parser = self.ghc-lib-parser_9_0_1_20210324;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
ghc-lib = self.ghc-lib_9_0_1_20210324;
ghc-lib-parser = self.ghc-lib-parser_9_0_2_20211226;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_6;
ghc-lib = self.ghc-lib_9_0_2_20211226;
# 2021-09-18: Need semialign >= 1.2 for correct bounds
semialign = super.semialign_1_2_0_1;

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

@ -2109,6 +2109,7 @@ broken-packages:
- heredocs
- her-lexer
- Hermes
- hermes-json
- herms
- hetero-dict
- heterogeneous-list-literals
@ -2869,6 +2870,7 @@ broken-packages:
- libsystemd-daemon
- libtagc
- libxls
- libxlsxwriter-hs
- libxslt
- libyaml-streamly
- lie
@ -4383,6 +4385,7 @@ broken-packages:
- servant-streaming
- servant-to-elm
- servant-tracing
- servant-util-beam-pg
- servant-yaml
- servant-zeppelin
- server-generic

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

@ -158,13 +158,13 @@ extra-packages:
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
- ghc-lib == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version
- ghc-lib-parser == 9.0.1.* # 2021-11-05: Need one GHC 9.0.1 compatible version
- ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.1 compatible version
- ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
- ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
- ghc-lib-parser-ex == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
- doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.*
- brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.1
- ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.1
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
- ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2
package-maintainers:
abbradar:
@ -429,7 +429,6 @@ unsupported-platforms:
btrfs: [ x86_64-darwin, aarch64-darwin ] # depends on linux
bustle: [ x86_64-darwin, aarch64-darwin ] # uses glibc-specific ptsname_r
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
cut-the-crap: [ x86_64-darwin, aarch64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
@ -459,7 +458,6 @@ unsupported-platforms:
hbro: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
hbro-contrib: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
hcwiid: [ x86_64-darwin, aarch64-darwin ]
hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
HFuse: [ x86_64-darwin, aarch64-darwin ]
hidapi: [ x86_64-darwin, aarch64-darwin ]
hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ]
@ -514,7 +512,6 @@ unsupported-platforms:
reflex-localize-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
rtlsdr: [ x86_64-darwin, aarch64-darwin ]
rubberband: [ x86_64-darwin, aarch64-darwin ]
sbv: [ aarch64-linux ]
scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8
sdl2-mixer: [ x86_64-darwin, aarch64-darwin ]

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

@ -1,4 +1,4 @@
# Stackage LTS 18.19
# Stackage LTS 18.20
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -302,7 +302,7 @@ default-package-overrides:
- buffer-builder ==0.2.4.7
- buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.2
- bugsnag-hs ==0.2.0.7
- bugsnag-hs ==0.2.0.8
- bugzilla-redhat ==0.3.3
- burrito ==1.2.0.4
- butcher ==1.3.3.2
@ -310,7 +310,7 @@ default-package-overrides:
- bv ==0.5
- bv-little ==1.1.1
- byteable ==0.1.1
- byte-count-reader ==0.10.1.7
- byte-count-reader ==0.10.1.8
- bytedump ==1.0
- byte-order ==0.1.2.0
- byteorder ==1.0.4
@ -362,7 +362,7 @@ default-package-overrides:
- cborg ==0.2.6.0
- cborg-json ==0.2.3.0
- cdar-mBound ==0.1.0.4
- c-enum ==0.1.0.1
- c-enum ==0.1.1.0
- cereal ==0.5.8.2
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
@ -467,7 +467,7 @@ default-package-overrides:
- console-style ==0.0.2.1
- constraint ==0.1.4.0
- constraints ==0.13.2
- constraints-extras ==0.3.2.0
- constraints-extras ==0.3.2.1
- constraint-tuples ==0.1.2
- construct ==0.3.0.2
- contravariant ==1.5.5
@ -513,7 +513,7 @@ default-package-overrides:
- csp ==1.4.0
- css-syntax ==0.1.0.0
- css-text ==0.1.3.0
- c-struct ==0.1.0.1
- c-struct ==0.1.1.0
- csv ==0.1.2
- ctrie ==0.2
- cubicbezier ==0.6.0.6
@ -974,7 +974,7 @@ default-package-overrides:
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- hapistrano ==0.4.3.0
- happstack-server ==7.7.1.1
- happstack-server ==7.7.1.2
- happy ==1.20.0
- happy-meta ==0.2.0.11
- HasBigDecimal ==0.1.1
@ -1070,7 +1070,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- hnock ==0.4.0
- hoauth2 ==1.16.0
- hoogle ==5.0.18.2
- hoogle ==5.0.18.3
- hOpenPGP ==2.9.7
- hopenpgp-tools ==0.23.6
- hopenssl ==2.2.4
@ -1588,7 +1588,7 @@ default-package-overrides:
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.2.1
- mysql-simple ==0.4.7
- mysql-simple ==0.4.7.1
- n2o ==0.11.1
- nagios-check ==0.3.2
- names-th ==0.3.0.1
@ -1881,7 +1881,7 @@ default-package-overrides:
- pureMD5 ==2.1.4
- purescript-bridge ==0.14.0.0
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==2.1.0.7
- pusher-http-haskell ==2.1.0.8
- pvar ==1.0.0.0
- PyF ==0.9.0.3
- qchas ==1.1.0.1
@ -2009,7 +2009,7 @@ default-package-overrides:
- rio-prettyprint ==0.1.1.0
- roc-id ==0.1.0.0
- rocksdb-haskell ==1.0.1
- rocksdb-haskell-jprupp ==2.1.3
- rocksdb-haskell-jprupp ==2.1.4
- rocksdb-query ==0.4.2
- roles ==0.2.1.0
- rope-utf16-splay ==0.3.2.0
@ -2076,7 +2076,7 @@ default-package-overrides:
- semirings ==0.6
- semiring-simple ==1.0.0.1
- semver ==0.4.0.1
- sendfile ==0.7.11.1
- sendfile ==0.7.11.4
- sendgrid-v3 ==0.3.0.0
- seqalign ==0.2.0.4
- seqid ==0.6.2
@ -2126,7 +2126,7 @@ default-package-overrides:
- shake-language-c ==0.12.0
- shake-plus ==0.3.4.0
- shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25
- shakespeare ==2.0.25.1
- shared-memory ==0.2.0.0
- ShellCheck ==0.7.2
- shell-conduit ==5.0.0
@ -2191,7 +2191,7 @@ default-package-overrides:
- sop-core ==0.5.0.1
- sort ==1.0.0.0
- sorted-list ==0.2.1.0
- sourcemap ==0.1.6.1
- sourcemap ==0.1.7
- sox ==0.2.3.1
- soxlib ==0.0.3.1
- spacecookie ==1.0.0.1
@ -2245,7 +2245,7 @@ default-package-overrides:
- store-streaming ==0.2.0.3
- stratosphere ==0.59.1
- Stream ==0.4.7.2
- streaming ==0.2.3.0
- streaming ==0.2.3.1
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.1
- streaming-commons ==0.2.2.3
@ -2283,7 +2283,7 @@ default-package-overrides:
- swagger ==0.3.0
- swagger2 ==2.6
- sweet-egison ==0.1.1.3
- swish ==0.10.0.8
- swish ==0.10.0.9
- syb ==0.7.2.1
- sydtest ==0.2.0.0
- sydtest-discover ==0.0.0.1
@ -2411,7 +2411,7 @@ default-package-overrides:
- th-test-utils ==1.1.1
- th-utilities ==0.2.4.3
- thyme ==0.3.5.5
- tidal ==1.7.8
- tidal ==1.7.9
- tile ==0.3.0.0
- time-compat ==1.9.5
- timeit ==2.0
@ -2424,8 +2424,8 @@ default-package-overrides:
- timerep ==2.0.1.0
- timer-wheel ==0.3.0
- time-units ==1.0.0
- timezone-olson ==0.2.0
- timezone-series ==0.1.9
- timezone-olson ==0.2.1
- timezone-series ==0.1.13
- tinylog ==0.15.0
- titlecase ==1.0.1
- tldr ==0.9.2
@ -2454,7 +2454,7 @@ default-package-overrides:
- triplesec ==0.2.2.1
- trivial-constraint ==0.7.0.0
- tsv2csv ==0.1.0.2
- ttc ==1.1.0.2
- ttc ==1.1.1.0
- ttl-hashtables ==1.4.1.0
- ttrie ==0.1.2.2
- tuple ==0.3.0.2
@ -2565,7 +2565,7 @@ default-package-overrides:
- vector-algorithms ==0.8.0.4
- vector-binary-instances ==0.2.5.2
- vector-buffer ==0.4.1
- vector-builder ==0.3.8.2
- vector-builder ==0.3.8.3
- vector-bytes-instances ==0.1.1
- vector-circular ==0.1.3
- vector-instances ==3.4
@ -2591,7 +2591,7 @@ default-package-overrides:
- wai-enforce-https ==0.0.2.1
- wai-eventsource ==3.0.0
- wai-extra ==3.1.7
- wai-feature-flags ==0.1.0.2
- wai-feature-flags ==0.1.0.3
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.7
- wai-middleware-auth ==0.2.5.1
@ -2628,7 +2628,7 @@ default-package-overrides:
- Win32 ==2.6.2.1
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.3.4.1
- witch ==0.3.4.2
- witherable ==0.4.2
- within ==0.2.0.1
- with-location ==0.1.0

2
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -794,6 +794,7 @@ dont-distribute-packages:
- condor
- conductive-hsc3
- conductive-song
- conduit-aeson
- conduit-vfs-zip
- confcrypt
- conferer-provider-dhall
@ -1185,6 +1186,7 @@ dont-distribute-packages:
- funnyprint
- funsat
- fused-effects-squeal
- futhark_0_21_2
- fwgl-glfw
- fwgl-javascript
- fxpak

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

File diff suppressed because it is too large Load Diff

3
pkgs/development/libraries/audio/roc-toolkit/default.nix
View File

@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
else [ "--with-libraries=${openfec}/lib"
"--with-openfec-includes=${openfec.dev}/include" ]);
prePatch = lib.optionalString stdenv.isAarch64
"sed -i 's/c++98/c++11/g' SConstruct";
preConfigure = ''
sconsFlags+=" --prefix=$out"
'';

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "nameparser";
version = "1.0.6";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0av5kraczczp0hvwpkdaw7kl2hk9k4dyll08rg180n52a2dm0pra";
sha256 = "bbd4831c72426757ec59674a1aad29c40bf411358a6d6e1cdd68002cbcb90d08";
};
LC_ALL="en_US.UTF-8";

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pynamodb";
version = "5.1.0";
version = "5.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "7f351d70b9f4da95ea2d7e50299640e4c46c83b7b24bea5daf110acd2e5aef2b";
sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60";
};
propagatedBuildInputs = [ python-dateutil botocore ];

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

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "pysptk";
version = "0.1.18";
version = "0.1.20";
src = fetchPypi {
inherit pname version;
sha256 = "34c5ccc40c9e177cfd764daa9f7635c4c1e648e14ce78ba975537dae5a14c4e4";
sha256 = "29e8e6a76243f3be728d23450982bd9f916530634079252a490ba7182bef30ca";
};
PYSPTK_BUILD_VERSION = 0;

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.9.39";
version = "3.9.40";
src = fetchPypi {
inherit pname version;
sha256 = "2fe246ff69267a1e8cdfcf962d4eddad5d748f744e4095c94711b68da73e29d2";
sha256 = "321005b498361548ce2e048f8499a347d8f38c75ff9f74cee7b118c84b0c41d4";
};
propagatedBuildInputs = [ numpy ];

2
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
View File

@ -1,4 +1,4 @@
{ lib, supportedGhcVersions ? [ "884" "8107" "901" ], stdenv, haskellPackages
{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages
, haskell }:
#
# The recommended way to override this package is

4
pkgs/tools/security/jaeles/default.nix
View File

@ -14,9 +14,7 @@ buildGoModule rec {
hash = "sha256-IGB+TYMOOO7fvRfDe9y+JSXuDSMDVJK+N4hS+kezG48=";
};
vendorSha256 = "sha256-3CKDkxvr7egHui6d8+25t9Zq2ePMUOULr+1NjEm4GXA=";
runVend = true;
vendorSha256 = "sha256-R2cP5zNuGUs0/KeaGhbQm1m5gVBVhpcFrS/jsph3EBk=";
# Tests want to download signatures
doCheck = false;

10
pkgs/top-level/haskell-packages.nix
View File

@ -101,7 +101,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
ghc902 = callPackage ../development/compilers/ghc/9.0.2.nix {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
# the oldest ghc with aarch64-darwin support is 8.10.5
@ -110,7 +110,7 @@ in {
else
packages.ghc8107Binary;
inherit (buildPackages.python3Packages) sphinx;
inherit (buildPackages.darwin) autoSignDarwinBinariesHook;
inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr;
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9;
llvmPackages = pkgs.llvmPackages_9;
};
@ -215,9 +215,9 @@ in {
ghc = bh.compiler.ghc8107;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
};
ghc901 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc901;
ghc = bh.compiler.ghc901;
ghc902 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc902;
ghc = bh.compiler.ghc902;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
};
ghc921 = callPackage ../development/haskell-modules {

2
pkgs/top-level/linux-kernels.nix
View File

@ -506,7 +506,7 @@ in {
});
packageAliases = {
linux_default = packages.linux_5_15;
linux_default = packages.linux_5_10;
# Update this when adding the newest kernel major version!
linux_latest = packages.linux_5_15;
linux_mptcp = packages.linux_mptcp_95;

10
pkgs/top-level/release-haskell.nix
View File

@ -51,7 +51,7 @@ let
released = with compilerNames; [
ghc884
ghc8107
ghc901
ghc902
ghc921
];
@ -313,7 +313,7 @@ let
haskell-language-server = [
compilerNames.ghc884
compilerNames.ghc8107
compilerNames.ghc901
compilerNames.ghc902
];
hoogle = released;
hlint = released;
@ -325,7 +325,7 @@ let
ghc-api-compat = [
compilerNames.ghc884
compilerNames.ghc8107
compilerNames.ghc901
compilerNames.ghc902
];
})
{
@ -393,11 +393,11 @@ let
jobs.pkgsMusl.haskell.compiler.ghc8107Binary
jobs.pkgsMusl.haskell.compiler.ghc884
jobs.pkgsMusl.haskell.compiler.ghc8107
jobs.pkgsMusl.haskell.compiler.ghc901
jobs.pkgsMusl.haskell.compiler.ghc902
jobs.pkgsMusl.haskell.compiler.ghc921
jobs.pkgsMusl.haskell.compiler.ghcHEAD
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc901
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc902
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc921
jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD
];