nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-18 12:02:15 +00:00 committed by GitHub
commit d5cae016d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 1978 additions and 1915 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,6 +6,8 @@
.vscode/
outputs/
result-*
result
!pkgs/development/python-modules/result
/doc/NEWS.html
/doc/NEWS.txt
/doc/manual.html

1
nixos/tests/kernel-generic.nix
View File

@ -30,7 +30,6 @@ let
linux_5_4_hardened
linux_5_10_hardened
linux_5_15_hardened
linux_5_18_hardened
linux_testing;
};

6
pkgs/applications/audio/mmlgui/default.nix
View File

@ -15,14 +15,14 @@
stdenv.mkDerivation rec {
pname = "mmlgui";
version = "unstable-2022-05-24";
version = "unstable-2022-09-15";
src = fetchFromGitHub {
owner = "superctr";
repo = "mmlgui";
rev = "fe2b298c1eddae4cc38096f6c1ba1ccaed562cf1";
rev = "163cc73a7c009d524b0d5aff94f9ed47fe19e3ce";
fetchSubmodules = true;
sha256 = "Q34zzZthdThMbduXcc/qMome89mAMrn1Vinr073u4zo=";
sha256 = "kKo3ge2wcDK2xU1YCfEwyqw84N+3jcbOEEsJHSpMpzY=";
};
postPatch = ''

4
pkgs/applications/misc/moonlight-qt/default.nix
View File

@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "moonlight-qt";
version = "4.1.0";
version = "4.2.1";
src = fetchFromGitHub {
owner = "moonlight-stream";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/HRmyf4sW8rsNmKMrlgPvq1L8gAEa6VRCyG2w5TfGkI=";
sha256 = "sha256-cDX6XiAPFIS/csVpRl7yyAexiZwjmxp1Ng9gAo1uUw8=";
fetchSubmodules = true;
};

4
pkgs/applications/science/math/mathematica/generic.nix
View File

@ -41,6 +41,8 @@
, pciutils
, tre
, unixODBC
, xcbutilimage
, xcbutilkeysyms
, xkeyboard_config
, xorg
, zlib
@ -94,6 +96,8 @@ in stdenv.mkDerivation {
pciutils
tre
unixODBC
xcbutilimage
xcbutilkeysyms
xkeyboard_config
] ++ (with xorg; [
libICE

7
pkgs/applications/science/math/mathematica/versions.nix
View File

@ -1,6 +1,13 @@
{ lib, requireFile }:
let versions = [
{
version = "13.1.0";
lang = "en";
language = "English";
sha256 = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
}
{
version = "13.0.1";
lang = "en";

4
pkgs/applications/version-management/github-desktop/default.nix
View File

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "github-desktop";
version = "3.0.5";
version = "3.0.6";
src = fetchurl {
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
sha256 = "sha256-7Sk2jDNZtOA04hkl/J+Up2yMGT8+FcXGPiUMcHhb7iY=";
hash = "sha256-UQsMT4/D571xgrU8C4HBoRO+qf08GCGerA4Y5gHcjRc=";
};
nativeBuildInputs = [

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

@ -1,6 +1,6 @@
{
"commit": "0fd2081c5296d9891054f8c742545d3871d76485",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fd2081c5296d9891054f8c742545d3871d76485.tar.gz",
"sha256": "1bxxlks9bjf9lmshlg8777j6h7gb5mpd9lxj97nkqh32gnlj8m38",
"msg": "Update from Hackage at 2022-08-28T23:15:42Z"
"commit": "d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d921dcbcb495c59ebdd949f1b70c00d0b0dfbc34.tar.gz",
"sha256": "1kdb392fhm2jvf3rsznx2gzwqki978bj3dpmpjfjxqadbzz9cl34",
"msg": "Update from Hackage at 2022-09-11T02:31:18Z"
}

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

@ -820,9 +820,9 @@ self: super: {
testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
}) (super.sensei.override {
hspec = self.hspec_2_10_1;
hspec = self.hspec_2_10_5;
hspec-wai = super.hspec-wai.override {
hspec = self.hspec_2_10_1;
hspec = self.hspec_2_10_5;
};
});
@ -1642,14 +1642,14 @@ self: super: {
servant-openapi3 = dontCheck super.servant-openapi3;
# Give hspec 2.10.* correct dependency versions without overrideScope
hspec_2_10_1 = doDistribute (super.hspec_2_10_1.override {
hspec-discover = self.hspec-discover_2_10_1;
hspec-core = self.hspec-core_2_10_1;
hspec_2_10_5 = doDistribute (super.hspec_2_10_5.override {
hspec-discover = self.hspec-discover_2_10_5;
hspec-core = self.hspec-core_2_10_5;
});
hspec-discover_2_10_1 = super.hspec-discover_2_10_1.override {
hspec-discover_2_10_5 = super.hspec-discover_2_10_5.override {
hspec-meta = self.hspec-meta_2_9_3;
};
hspec-core_2_10_1 = super.hspec-core_2_10_1.override {
hspec-core_2_10_5 = super.hspec-core_2_10_5.override {
hspec-meta = self.hspec-meta_2_9_3;
};
@ -2453,21 +2453,6 @@ self: super: {
# Bounds too strict on base and ghc-prim: https://github.com/tibbe/ekg-core/pull/43 (merged); waiting on hackage release
ekg-core = assert super.ekg-core.version == "0.1.1.7"; doJailbreak super.ekg-core;
elm2nix = appendPatches [
# unreleased, prereq for aeson-2 patch
(fetchpatch {
name = "elm2nix-pull-44.patch";
url = "https://patch-diff.githubusercontent.com/raw/cachix/elm2nix/pull/44.patch";
sha256 = "sha256-d6Ra3mIVKCA/5pEavsPi2TdN0qcRwU3gc634oWdYZq8=";
})
# https://github.com/cachix/elm2nix/issues/46#issuecomment-1056236009
(fetchpatch {
name = "elm2nix-aeson-2.patch";
url = "https://github.com/cachix/elm2nix/commit/1a35f07ad5d63085ffd7e5634355412e1112c4e9.patch";
sha256 = "sha256-HAwMvOyp2IdPyjwt+aKYogMqg5NZYlu897UqJy59eFc=";
})
] super.elm2nix;
# https://github.com/Synthetica9/nix-linter/issues/65
nix-linter = super.nix-linter.overrideScope (self: super: {
aeson = self.aeson_1_5_6_0;

4
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -152,4 +152,8 @@ self: super: {
# doctest-parallel dependency requires newer Cabal
regex-tdfa = dontCheck super.regex-tdfa;
# Unnecessarily strict lower bound on base
# https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823
megaparsec = doJailbreak super.megaparsec;
}

4
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -178,4 +178,8 @@ self: super: {
# doctest-parallel dependency requires newer Cabal
regex-tdfa = dontCheck super.regex-tdfa;
# Unnecessarily strict lower bound on base
# https://github.com/mrkkrp/megaparsec/pull/485#issuecomment-1250051823
megaparsec = doJailbreak super.megaparsec;
}

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

@ -341,6 +341,7 @@ broken-packages:
- bibdb
- bidi-icu
- bidirectional
- bidirectional-instances
- bidirectionalization-combined
- bidispec
- bidispec-extras
@ -662,6 +663,7 @@ broken-packages:
- church-maybe
- church-pair
- churros
- cicero-api
- cielo
- cil
- cinvoke
@ -3046,6 +3048,7 @@ broken-packages:
- located
- located-monad-logger
- loch
- loc-test
- log2json
- logentries
- logger
@ -3244,7 +3247,6 @@ broken-packages:
- mios
- MIP
- mismi-s3-core
- miso
- miso-examples
- mit-3qvpPyAi6mH
- mix-arrows
@ -3688,6 +3690,7 @@ broken-packages:
- pandoc-unlit
- pandoc-utils
- pandora
- panfiguration
- pang-a-lambda
- pangraph
- pan-os-syslog
@ -4299,6 +4302,7 @@ broken-packages:
- request
- request-monad
- req-url-extra
- reserve
- reservoir
- resolve
- resolve-trivial-conflicts
@ -4586,6 +4590,7 @@ broken-packages:
- signable
- signable-haskell-protoc
- signed-multiset
- significant-figures
- simd
- simfin
- simple-actors
@ -5665,6 +5670,7 @@ broken-packages:
- xsact
- xsd
- xslt
- xstatic-th
- xturtle
- y0l0bot
- yabi-muno
@ -5696,6 +5702,7 @@ broken-packages:
- yandex-translate
- yaop
- yapb
- yarl
- yarr
- yasi
- yate

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

@ -161,6 +161,8 @@ package-maintainers:
- hnix
- hnix-store-core
- hnix-store-remote
arturcygan:
- hevm
berberman:
- nvfetcher
- arch-web

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

@ -1,4 +1,4 @@
# Stackage LTS 19.20
# Stackage LTS 19.22
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -10,14 +10,14 @@ default-package-overrides:
- ace ==0.6
- acid-state ==0.16.1.1
- action-permutations ==0.0.0.1
- active ==0.2.0.15
- active ==0.2.0.16
- ad ==4.5.2
- ad-delcont ==0.3.0.0
- adjunctions ==4.4.2
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.1
- aern2-mp ==0.2.10.0
- aern2-real ==0.2.10.0
- aern2-mp ==0.2.11.0
- aern2-real ==0.2.11.0
- aeson ==2.0.3.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.1
@ -115,7 +115,7 @@ default-package-overrides:
- aur ==7.0.7
- authenticate ==1.3.5.1
- authenticate-oauth ==1.7
- autoexporter ==2.0.0.1
- autoexporter ==2.0.0.2
- auto-update ==0.1.6
- aws-cloudfront-signed-cookies ==0.2.0.10
- aws-xray-client ==0.1.0.2
@ -171,7 +171,7 @@ default-package-overrides:
- binaryen ==0.0.6.0
- binary-generic-combinators ==0.4.4.0
- binary-ieee754 ==0.1.0.0
- binary-instances ==1.0.2
- binary-instances ==1.0.3
- binary-list ==1.1.1.2
- binary-orphans ==1.0.3
- binary-parser ==0.5.7.2
@ -241,7 +241,7 @@ default-package-overrides:
- bugsnag-haskell ==0.0.4.4
- bugsnag-hs ==0.2.0.9
- bugzilla-redhat ==1.0.0
- burrito ==2.0.1.1
- burrito ==2.0.1.2
- butcher ==1.3.3.2
- buttplug-hs-core ==0.1.0.1
- bv ==0.5
@ -254,7 +254,7 @@ default-package-overrides:
- byteset ==0.1.1.0
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.2
- bytestring-lexing ==0.5.0.8
- bytestring-lexing ==0.5.0.9
- bytestring-mmap ==0.2.2
- bytestring-strict-builder ==0.4.5.6
- bytestring-to-vector ==0.3.0.1
@ -335,9 +335,9 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- circular ==0.4.0.3
- citeproc ==0.6.0.1
- clash-ghc ==1.6.3
- clash-lib ==1.6.3
- clash-prelude ==1.6.3
- clash-ghc ==1.6.4
- clash-lib ==1.6.4
- clash-prelude ==1.6.4
- classy-prelude ==1.5.0.2
- classy-prelude-conduit ==1.5.0
- classy-prelude-yesod ==1.5.0
@ -489,7 +489,7 @@ default-package-overrides:
- data-accessor-mtl ==0.2.0.4
- data-accessor-transformers ==0.2.1.7
- data-binary-ieee754 ==0.4.4
- data-bword ==0.1.0.1
- data-bword ==0.1.0.2
- data-checked ==0.3
- data-clist ==0.2
- data-default ==0.7.1.1
@ -539,12 +539,12 @@ default-package-overrides:
- debian ==4.0.4
- debian-build ==0.10.2.1
- debug-trace-var ==0.2.0
- dec ==0.0.4
- dec ==0.0.5
- Decimal ==0.5.2
- declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deferred-folds ==0.9.18.2
- dejafu ==2.4.0.3
- dejafu ==2.4.0.4
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0
- dependent-sum ==0.7.1.0
@ -555,7 +555,7 @@ default-package-overrides:
- derive-topdown ==0.0.3.0
- deriving-aeson ==0.2.8
- deriving-compat ==0.6.1
- derulo ==2.0.0.1
- derulo ==2.0.0.3
- detour-via-sci ==1.0.0
- df1 ==0.4
- dhall ==1.40.2
@ -565,7 +565,7 @@ default-package-overrides:
- di ==1.3
- diagrams ==1.4.0.1
- diagrams-contrib ==1.4.4
- diagrams-core ==1.5.0
- diagrams-core ==1.5.0.1
- diagrams-lib ==1.4.5.1
- diagrams-rasterific ==1.4.2.2
- diagrams-solve ==0.1.3
@ -663,13 +663,13 @@ default-package-overrides:
- emojis ==0.1.2
- enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0
- entropy ==0.4.1.7
- entropy ==0.4.1.10
- enummapset ==0.6.0.3
- enumset ==0.1
- enum-text ==0.5.3.0
- envelope ==0.2.2.0
- envparse ==0.4.1
- envy ==2.1.0.0
- envy ==2.1.1.0
- eq ==4.3
- equal-files ==0.0.5.3
- equational-reasoning ==0.7.0.1
@ -683,7 +683,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.12
- esqueleto ==3.5.7.0
- esqueleto ==3.5.8.1
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
- essence-of-live-coding-pulse ==0.2.6
@ -715,7 +715,7 @@ default-package-overrides:
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
- extra ==1.7.10
- extra ==1.7.12
- extractable-singleton ==0.0.1
- extrapolate ==0.4.6
- fail ==4.9.0.0
@ -741,13 +741,13 @@ default-package-overrides:
- fgl ==5.7.0.3
- fields-json ==0.4.0.0
- file-embed ==0.0.15.0
- file-embed-lzma ==0
- file-embed-lzma ==0.0.1
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- filepath-bytestring ==1.4.2.1.9
- file-path-th ==0.1.0.0
- filepattern ==0.1.2
- filepattern ==0.1.3
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- filtrable ==0.1.6.0
@ -759,10 +759,10 @@ default-package-overrides:
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.10
- fixed ==0.3
- fixed-length ==0.2.3
- fixed-length ==0.2.3.1
- fixed-vector ==1.2.1.0
- fixed-vector-hetero ==0.6.1.1
- fix-whitespace ==0.0.9
- fix-whitespace ==0.0.10
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.3
@ -772,7 +772,7 @@ default-package-overrides:
- flexible-defaults ==0.0.3
- FloatingHex ==0.5
- floatshow ==0.2.4
- flow ==2.0.0.0
- flow ==2.0.0.1
- flush-queue ==1.0.0
- fmlist ==0.9.4
- fmt ==0.6.3.0
@ -814,7 +814,7 @@ default-package-overrides:
- functor-classes-compat ==2.0.0.2
- functor-combinators ==0.4.1.0
- fused-effects ==1.1.2.0
- fusion-plugin ==0.2.4
- fusion-plugin ==0.2.5
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.1
@ -855,7 +855,7 @@ default-package-overrides:
- genvalidity-hspec-persistent ==1.0.0.0
- genvalidity-mergeless ==0.3.0.0
- genvalidity-path ==1.0.0.0
- genvalidity-persistent ==1.0.0.0
- genvalidity-persistent ==1.0.0.1
- genvalidity-property ==1.0.0.0
- genvalidity-scientific ==1.0.0.0
- genvalidity-text ==1.0.0.1
@ -885,7 +885,7 @@ default-package-overrides:
- ghc-prof ==1.4.1.11
- ghc-source-gen ==0.4.3.0
- ghc-syntax-highlighter ==0.0.7.0
- ghc-tcplugins-extra ==0.4.2
- ghc-tcplugins-extra ==0.4.3
- ghc-trace-events ==0.1.2.6
- ghc-typelits-extra ==0.4.3
- ghc-typelits-knownnat ==0.7.6
@ -916,7 +916,7 @@ default-package-overrides:
- gi-pango ==1.0.26
- githash ==0.1.6.2
- github ==0.27
- github-release ==2.0.0.1
- github-release ==2.0.0.2
- github-rest ==1.1.2
- github-types ==0.2.1
- github-webhooks ==0.15.0
@ -1007,7 +1007,7 @@ default-package-overrides:
- hasktags ==0.72.0
- hasql ==1.5.1
- hasql-migration ==0.3.0
- hasql-notifications ==0.2.0.2
- hasql-notifications ==0.2.0.3
- hasql-optparse-applicative ==0.3.0.9
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
@ -1125,7 +1125,7 @@ default-package-overrides:
- hslua-module-path ==1.0.3
- hslua-module-system ==1.0.2
- hslua-module-text ==1.0.2
- hslua-module-version ==1.0.2
- hslua-module-version ==1.0.3
- hslua-objectorientation ==2.1.0
- hslua-packaging ==2.1.0
- hsndfile ==0.8.0
@ -1196,7 +1196,7 @@ default-package-overrides:
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.2.0
- HUnit-approx ==1.1.1.1
- hunit-dejafu ==2.0.0.5
- hunit-dejafu ==2.0.0.6
- hvect ==0.4.0.1
- hvega ==0.12.0.3
- hw-balancedparens ==0.4.1.2
@ -1327,7 +1327,7 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.10
- json-feed ==2.0.0.3
- json-feed ==2.0.0.4
- jsonifier ==0.2.1.1
- jsonpath ==0.2.1.0
- json-stream ==0.4.4.1
@ -1357,7 +1357,7 @@ default-package-overrides:
- krank ==0.2.3
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==2.0.0.2
- lackey ==2.0.0.3
- LambdaHack ==0.11.0.0
- lame ==0.2.0
- language-bash ==0.9.2
@ -1385,7 +1385,7 @@ default-package-overrides:
- lazyio ==0.1.0.4
- lazysmallcheck ==0.6
- lca ==0.4
- leancheck ==0.9.10
- leancheck ==0.9.12
- leancheck-instances ==0.0.4
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.5
@ -1405,7 +1405,7 @@ default-package-overrides:
- LetsBeRational ==1.0.0.0
- leveldb-haskell ==0.6.5
- lexer-applicative ==2.1.0.2
- libBF ==0.6.4
- libBF ==0.6.5.1
- libffi ==0.1
- libgit ==0.3.1
- libgraph ==1.14
@ -1430,9 +1430,9 @@ default-package-overrides:
- ListLike ==4.7.7
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==2.0.0.0
- list-singleton ==2.0.0.2
- list-t ==1.0.5.3
- list-transformer ==1.0.8
- list-transformer ==1.0.9
- ListTree ==0.2.3
- ListZipper ==1.2.0.2
- literatex ==0.2.0.2
@ -1443,7 +1443,7 @@ default-package-overrides:
- loc ==0.1.3.16
- locators ==0.3.0.3
- loch-th ==0.2.2
- lockfree-queue ==0.2.3.1
- lockfree-queue ==0.2.4
- log-domain ==0.13.2
- logfloat ==0.13.4
- logging ==3.0.5
@ -1467,7 +1467,7 @@ default-package-overrides:
- lxd-client-config ==0.1.0.1
- lz4 ==0.2.3.1
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3
- lzma ==0.0.0.4
- lzma-clib ==5.2.2
- lzma-conduit ==1.2.3
- machines ==0.7.3
@ -1502,8 +1502,8 @@ default-package-overrides:
- mcmc-types ==1.0.3
- median-stream ==0.7.0.0
- med-module ==0.1.2.2
- megaparsec ==9.2.1
- megaparsec-tests ==9.2.1
- megaparsec ==9.2.2
- megaparsec-tests ==9.2.2
- mega-sdist ==0.4.2.1
- memory ==0.16.0
- MemoTrie ==0.6.10
@ -1540,7 +1540,7 @@ default-package-overrides:
- mintty ==0.1.4
- missing-foreign ==0.1.1
- MissingH ==1.5.0.1
- mixed-types-num ==0.5.10
- mixed-types-num ==0.5.11
- mmap ==0.5.9
- mmark ==0.0.7.6
- mmark-cli ==0.0.5.1
@ -1562,7 +1562,7 @@ default-package-overrides:
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- monadlist ==0.0.2
- monad-logger ==0.3.36
- monad-logger ==0.3.37
- monad-logger-json ==0.1.0.0
- monad-logger-logstash ==0.2.0.2
- monad-logger-prefix ==0.1.12
@ -1693,7 +1693,7 @@ default-package-overrides:
- NumInstances ==1.4
- numtype-dk ==0.5.0.3
- nuxeo ==0.3.2
- nvim-hs ==2.2.0.2
- nvim-hs ==2.2.0.3
- ObjectName ==1.1.0.2
- ochintin-daicho ==0.3.4.2
- o-clock ==1.2.1.1
@ -1734,7 +1734,7 @@ default-package-overrides:
- options ==1.2.1.1
- optparse-applicative ==0.16.1.0
- optparse-enum ==1.0.0.0
- optparse-generic ==1.4.7
- optparse-generic ==1.4.8
- optparse-simple ==0.1.1.4
- optparse-text ==0.1.1.0
- OrderedBits ==0.0.2.0
@ -1754,7 +1754,7 @@ default-package-overrides:
- pandoc-plot ==1.4.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22.2.1
- pantry ==0.5.6
- pantry ==0.5.7
- parallel ==3.2.2.0
- parallel-io ==0.3.5
- parameterized ==0.5.0.0
@ -1773,6 +1773,7 @@ default-package-overrides:
- password ==3.0.1.0
- password-instances ==3.0.0.0
- password-types ==1.0.0.0
- pasta-curves ==0.0.1.0
- path ==0.9.2
- path-binary-instance ==0.1.0.1
- path-dhall-instance ==0.2.1.0
@ -1805,7 +1806,7 @@ default-package-overrides:
- perfect-hash-generator ==0.2.0.6
- persist ==0.1.1.5
- persistent ==2.13.3.5
- persistent-discover ==0.1.0.5
- persistent-discover ==0.1.0.6
- persistent-documentation ==0.1.0.4
- persistent-mongoDB ==2.13.0.1
- persistent-mtl ==0.4.0.0
@ -1984,7 +1985,7 @@ default-package-overrides:
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- ral ==0.2.1
- rampart ==2.0.0.2
- rampart ==2.0.0.3
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.2.1.1
@ -2000,9 +2001,9 @@ default-package-overrides:
- rank2classes ==1.4.4
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==2.0.0.3
- ratel ==2.0.0.4
- rate-limit ==1.4.2
- ratel-wai ==2.0.0.0
- ratel-wai ==2.0.0.1
- rattle ==0.2
- rattletrap ==11.2.4
- Rattus ==0.5.0.1
@ -2091,7 +2092,7 @@ default-package-overrides:
- rope-utf16-splay ==0.3.2.0
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.8
- rpmbuild-order ==0.4.9
- rpm-nvr ==0.1.2
- rp-tree ==0.7.1
- RSA ==2.4.1
@ -2114,7 +2115,7 @@ default-package-overrides:
- salak ==0.3.6
- salak-yaml ==0.3.5.3
- saltine ==0.1.1.1
- salve ==2.0.0.0
- salve ==2.0.0.1
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
@ -2225,13 +2226,13 @@ default-package-overrides:
- show-combinators ==0.2.0.0
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5.2
- silently ==1.2.5.3
- simple-affine-space ==0.1.1
- simple-cabal ==0.1.3
- simple-cmd ==0.2.7
- simple-cmd-args ==0.1.8
- simple-log ==0.9.12
- simple-media-timestamp ==0.2.0.0
- simple-media-timestamp ==0.2.1.0
- simple-media-timestamp-attoparsec ==0.1.0.0
- simple-media-timestamp-formatting ==0.1.1.0
- simple-reflect ==0.3.3
@ -2240,7 +2241,7 @@ default-package-overrides:
- since ==0.0.0
- singleton-bool ==0.1.6
- singleton-nats ==0.4.6
- singletons ==3.0.1
- singletons ==3.0.2
- singletons-base ==3.0
- singletons-presburger ==0.6.1.0
- singletons-th ==3.0
@ -2288,7 +2289,7 @@ default-package-overrides:
- speedy-slice ==0.3.2
- Spintax ==0.3.6
- splice ==0.6.1.1
- splint ==1.0.2.0
- splint ==1.0.2.1
- split ==0.2.3.5
- splitmix ==0.1.0.4
- splitmix-distributions ==0.9.0.0
@ -2302,7 +2303,7 @@ default-package-overrides:
- sql-words ==0.1.6.4
- squeather ==0.8.0.0
- srcloc ==0.6.0.1
- srt ==0.1.1.0
- srt ==0.1.2.0
- srt-attoparsec ==0.1.0.0
- srt-dhall ==0.1.0.0
- srt-formatting ==0.1.0.0
@ -2343,7 +2344,7 @@ default-package-overrides:
- Stream ==0.4.7.2
- streaming ==0.2.3.1
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.3
- streaming-bytestring ==0.2.4
- streaming-cassava ==0.2.0.0
- streaming-commons ==0.2.2.4
- streamly ==0.8.1.1
@ -2370,7 +2371,7 @@ default-package-overrides:
- stripe-scotty ==1.1.0.2
- stripe-signature ==1.0.0.14
- stripe-wreq ==1.0.1.14
- strive ==6.0.0.3
- strive ==6.0.0.4
- strong-path ==1.1.4.0
- structs ==0.1.6
- structured ==0.1.1
@ -2416,7 +2417,7 @@ default-package-overrides:
- tasty ==1.4.2.3
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.3.2
- tasty-dejafu ==2.0.0.8
- tasty-dejafu ==2.0.0.9
- tasty-discover ==4.2.4
- tasty-expected-failure ==0.12.3
- tasty-fail-fast ==0.0.3
@ -2500,13 +2501,13 @@ default-package-overrides:
- th-extras ==0.0.0.6
- th-lego ==0.3.0.1
- th-lift ==0.8.2
- th-lift-instances ==0.1.19
- th-lift-instances ==0.1.20
- th-nowq ==0.1.0.5
- th-orphans ==0.13.13
- th-orphans ==0.13.14
- th-printf ==0.7
- thread-hierarchy ==0.3.0.2
- thread-local-storage ==0.2
- threads ==0.5.1.6
- threads ==0.5.1.7
- thread-supervisor ==0.2.0.0
- th-reify-compat ==0.0.1.5
- th-reify-many ==0.1.10
@ -2544,7 +2545,7 @@ default-package-overrides:
- tmp-postgres ==1.34.1.0
- tmp-proc ==0.5.1.2
- tophat ==1.0.5.1
- topograph ==1.0.0.1
- topograph ==1.0.0.2
- torsor ==0.1
- tostring ==0.2.1.1
- tracing ==0.0.7.3
@ -2557,7 +2558,7 @@ default-package-overrides:
- transformers-fix ==1.0
- transient ==0.7.0.0
- traverse-with-class ==1.0.1.1
- tree-diff ==0.2.1.1
- tree-diff ==0.2.2
- tree-fun ==0.8.1.0
- tree-view ==0.5.1
- trifecta ==2.1.2
@ -2635,7 +2636,7 @@ default-package-overrides:
- universe-reverse-instances ==1.1.1
- universe-some ==1.2.1
- universum ==1.7.3
- unix-bytestring ==0.3.7.7
- unix-bytestring ==0.3.7.8
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unliftio ==0.2.22.0
@ -2745,9 +2746,9 @@ default-package-overrides:
- wcwidth ==0.0.2
- webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1
- webgear-core ==1.0.3
- webgear-openapi ==1.0.3
- webgear-server ==1.0.3
- webgear-core ==1.0.4
- webgear-openapi ==1.0.4
- webgear-server ==1.0.4
- webpage ==0.0.5.1
- web-plugins ==0.4.1
- web-routes ==0.27.14.4
@ -2767,7 +2768,7 @@ default-package-overrides:
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- wire-streams ==0.1.1.0
- witch ==1.0.0.2
- witch ==1.0.0.3
with-compiler: ghc-9.0.2
- withdependencies ==0.3.0
- witherable ==0.4.2
@ -2824,8 +2825,8 @@ with-compiler: ghc-9.0.2
- xml-picklers ==0.3.6
- xml-to-json-fast ==2.0.0
- xml-types ==0.3.8
- xmonad ==0.17.0
- xmonad-contrib ==0.17.0
- xmonad ==0.17.1
- xmonad-contrib ==0.17.1
- xmonad-extras ==0.17.0
- xor ==0.0.1.1
- xss-sanitize ==0.3.7

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

@ -940,7 +940,6 @@ dont-distribute-packages:
- claferwiki
- clash
- classify-frog
- classy-miso
- clckwrks
- clckwrks-cli
- clckwrks-dot-com
@ -2652,7 +2651,6 @@ dont-distribute-packages:
- minioperational
- minirotate
- mirror-tweet
- miso-action-logger
- miss
- miss-porcelain
- missing-py2
@ -3199,6 +3197,7 @@ dont-distribute-packages:
- registry-hedgehog
- registry-hedgehog-aeson
- registry-messagepack
- registry-options
- regular-extras
- regular-web
- regular-xmlpickler
@ -3242,16 +3241,13 @@ dont-distribute-packages:
- rewrite
- rewriting
- rezoom
- rfc
- rfc-env
- rfc-http-client
- rfc-psql
- rfc-redis
- rfc-servant
- rhythm-game-tutorial
- ribosome
- ribosome-root
- ribosome-test
- ridley-extras
- rio-process-pool
- riot
@ -3322,6 +3318,7 @@ dont-distribute-packages:
- satchmo-funsat
- satchmo-minisat
- satchmo-toysat
- sauron
- sc2-lowlevel
- sc2-support
- sc2hs
@ -3608,6 +3605,7 @@ dont-distribute-packages:
- sydtest
- sydtest-aeson
- sydtest-amqp
- sydtest-autodocodec
- sydtest-hedgehog
- sydtest-hedis
- sydtest-hspec
@ -3924,6 +3922,7 @@ dont-distribute-packages:
- warped
- wavesurfer
- wavy
- weatherhs
- web-inv-route
- web-mongrel2
- web-page

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

@ -230,9 +230,6 @@ self: super: builtins.intersectAttrs super {
preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
}) super.tz;
# Nix-specific workaround
xmonad = appendPatch ./patches/xmonad_0_17_0-nix.patch (dontCheck super.xmonad);
# https://hydra.nixos.org/build/128665302/nixlog/3
# Disable tests because they require a running dbus session
xmonad-dbus = dontCheck super.xmonad-dbus;

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

File diff suppressed because it is too large Load Diff

34
pkgs/development/haskell-modules/patches/xmonad_0_17_0-nix.patch
View File

@ -1,34 +0,0 @@
diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
index 46a0939..92af53d 100644
--- a/src/XMonad/Core.hs
+++ b/src/XMonad/Core.hs
@@ -46,6 +46,7 @@ import Data.Traversable (for)
import Data.Time.Clock (UTCTime)
import Data.Default.Class
import Data.List (isInfixOf)
+import System.Environment (lookupEnv)
import System.FilePath
import System.IO
import System.Info
@@ -458,7 +459,8 @@ xfork x = io . forkProcess . finally nullStdin $ do
-- | Use @xmessage@ to show information to the user.
xmessage :: MonadIO m => String -> m ()
xmessage msg = void . xfork $ do
- executeFile "xmessage" True
+ xmessageBin <- fromMaybe "xmessage" <$> liftIO (lookupEnv "XMONAD_XMESSAGE")
+ executeFile xmessageBin True
[ "-default", "okay"
, "-xrm", "*international:true"
, "-xrm", "*fontSet:-*-fixed-medium-r-normal-*-18-*-*-*-*-*-*-*,-*-fixed-*-*-*-*-18-*-*-*-*-*-*-*,-*-*-*-*-*-*-18-*-*-*-*-*-*-*"
@@ -654,8 +656,9 @@ compile dirs method =
bracket (openFile (errFileName dirs) WriteMode) hClose $ \err -> do
let run = runProc (cfgDir dirs) err
case method of
- CompileGhc ->
- run "ghc" ghcArgs
+ CompileGhc -> do
+ ghc <- fromMaybe "ghc" <$> (lookupEnv "XMONAD_GHC")
+ run ghc ghcArgs
CompileStackGhc stackYaml ->
run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&.
run "stack" ("ghc" : "--stack-yaml" : stackYaml : "--" : ghcArgs)

15
pkgs/development/libraries/SDL_compat/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, SDL2
@ -19,25 +18,15 @@ let
in
stdenv.mkDerivation rec {
pname = "SDL_compat";
version = "1.2.52";
version = "1.2.56";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "sdl12-compat";
rev = "release-" + version;
hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg=";
hash = "sha256-qd+hdJygJ+D2Ult6kmhUJmoPjasOFnBziTI8QtNiclI=";
};
patches = optionals stdenv.hostPlatform.isDarwin [
# Fix broken install name in dylib, https://github.com/libsdl-org/sdl12-compat/issues/194
# Remove when bump > 1.2.52
(fetchpatch {
name = "SDL_compat-fix-install-name.patch";
url = "https://github.com/libsdl-org/sdl12-compat/commit/5642d47ae489f2eb362cece2464ecc466a700ed5.patch";
sha256 = "sha256-kQ5H8gXjTZVHHRF6UpgXKl3NIy87iULcc2iCsYt5Hqo=";
})
];
nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ SDL2 ]

4
pkgs/development/libraries/kddockwidgets/default.nix
View File

@ -8,13 +8,13 @@
mkDerivation rec {
pname = "KDDockWidgets";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "KDAB";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7jC0zl5ESwqZXzvFJYmPvRhwFitse05NuYoTgFWiHac=";
sha256 = "sha256-rAv0P7tRcgCTB/ZM93wKF8oRZc7KqPyoDcnRn5Rel/k=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/development/python-modules/aiosmb/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, asyauth
, asysocks
, buildPythonPackage
, colorama
@ -15,17 +16,18 @@
buildPythonPackage rec {
pname = "aiosmb";
version = "0.3.8";
version = "0.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-CvqQEJPwrZHQuEId7GbIC9LpyyN6jaQFmEQTpddHU5g=";
hash = "sha256-h8wYBuxLq2JiQyGQFPirGblcSjtGqoi9ODvCNLH9ec8=";
};
propagatedBuildInputs = [
asyauth
asysocks
colorama
minikerberos

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "airthings-ble";
version = "0.5.0";
version = "0.5.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "vincegio";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ihNy5Rme20fCO1tG7aqdVFhSF3DI9hAlge54+/nNGLs=";
hash = "sha256-polhWyEyu7ZaJ0fgXOhai+I/XhI8FTYYQGrRxiqAOPc=";
};
postPatch = ''

43
pkgs/development/python-modules/asyauth/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, asn1crypto
, asysocks
, buildPythonPackage
, fetchPypi
, minikerberos
, pythonOlder
, unicrypto
}:
buildPythonPackage rec {
pname = "asyauth";
version = "0.0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-8qSYaPgidfDH8aebLFtLhLxt253xTHTkC0xwV346KdM=";
};
propagatedBuildInputs = [
asn1crypto
asysocks
minikerberos
unicrypto
];
# Project doesn't have tests
doCheck = false;
pythonImportsCheck = [
"asyauth"
];
meta = with lib; {
description = "Unified authentication library";
homepage = "https://github.com/skelsec/asyauth";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "crownstone-sse";
version = "2.0.3";
version = "2.0.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "crownstone";
repo = "crownstone-lib-python-sse";
rev = version;
sha256 = "sha256-O1joOH7HCXYCro26p6foMMpg0UXfOgXD0BXuN50OK7U=";
sha256 = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c=";
};
propagatedBuildInputs = [

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

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "gehomesdk";
version = "0.5.6";
version = "0.5.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EW26TzmD+F2IkzJkcoUdfYIJ3vkBYQhIFiEqnfDSmiw=";
sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo=";
};
propagatedBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "openevsewifi";
version = "1.1.0";
version = "1.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "miniconfig";
repo = "python-openevse-wifi";
rev = "v${version}";
sha256 = "sha256-pNm+zupBGijCXIkdanMk7nE/+SFvSEFp9/Ht5OoxQrU=";
sha256 = "sha256-7+BC5WG0JoyHNjgsoJBQRVDpmdXMJCV4bMf6pIaS5qo=";
};
nativeBuildInputs = [

9
pkgs/development/python-modules/pep440/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pep440";
version = "0.1.1";
version = "0.1.2";
format = "flit";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-E9F4mHaavQKK8PYnRcnOdfW7mXcBKn1dTInCknLeNO4=";
hash = "sha256-WLNyRswrE/7hyio8CSyzcE0h7PYhpb27Fo5E5pf20E0=";
};
nativeBuildInputs = [
@ -26,6 +26,11 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTestPaths = [
# Don't run CLI tests
"tests/test_cli.py"
];
pythonImportsCheck = [
"pep440"
];

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyeight";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mezz64";
repo = "pyEight";
rev = version;
sha256 = "sha256-H8f7990+ZKoOEzPgeYt4vMHCrcWwIa0X1gMh2qXBAoo=";
sha256 = "sha256-vW64m8XQZ9XfgjlZph47JFyOsxWtCbIJZBZVwsTrjLs=";
};
propagatedBuildInputs = [

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyrisco";
version = "0.5.4";
version = "0.5.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "OnFreund";
repo = pname;
rev = "v${version}";
sha256 = "sha256-/h0vqclvVjoY/tjAWAYjvSqVaAaXeXNafECygutvACA=";
sha256 = "sha256-yUWZfCrd2w2jg34FrVwfYyQPSLHOz9RiZQpri4YXV1k=";
};
propagatedBuildInputs = [ aiohttp ];

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyvicare";
version = "2.16.4";
version = "2.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "somm15";
repo = "PyViCare";
rev = version;
sha256 = "sha256-RFnQKGISPMrC53yAv3fu7FpbDNugLPQILXCPi5ik2qU=";
sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

20
pkgs/development/python-modules/stanza/default.nix
View File

@ -1,29 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, emoji
, fetchFromGitHub
, numpy
, protobuf
, pythonOlder
, requests
, six
, torch
, tqdm
, transformers
}:
buildPythonPackage rec {
pname = "stanza";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "stanfordnlp";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-EAES3UpJqE7wmvCPycFhwI1lMrReN+L6W8CEDwdHTlA=";
hash = "sha256-EAES3UpJqE7wmvCPycFhwI1lMrReN+L6W8CEDwdHTlA=";
};
disabled = pythonOlder "3.6";
propagatedBuildInputs = [
emoji
numpy
@ -32,13 +34,15 @@ buildPythonPackage rec {
six
torch
tqdm
transformers
];
# disabled, because the tests try to connect to the internet which
# is forbidden in the sandbox
# Tests require network access
doCheck = false;
pythonImportsCheck = [ "stanza" ];
pythonImportsCheck = [
"stanza"
];
meta = with lib; {
description = "Official Stanford NLP Python Library for Many Human Languages";

19
pkgs/development/python-modules/winacl/default.nix
View File

@ -1,24 +1,37 @@
{ lib
, buildPythonPackage
, cryptography
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "winacl";
version = "0.1.3";
version = "0.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-G6xWep0hMACCqiJGuw+UpZH8qOIY4WO6sY3w4y7v6gY=";
hash = "sha256-8/dLFbzn7ARuJ27MA8LSMCykBdEntYQXuOyj/yqjaWE=";
};
propagatedBuildInputs = [
cryptography
];
postPatch = ''
substituteInPlace setup.py \
--replace "cryptography>=38.0.1" "cryptography"
'';
# Project doesn't have tests
doCheck = false;
pythonImportsCheck = [ "winacl" ];
pythonImportsCheck = [
"winacl"
];
meta = with lib; {
description = "Python module for ACL/ACE/Security descriptor manipulation";

21
pkgs/games/cataclysm-dda/stable.nix
View File

@ -1,5 +1,13 @@
{ lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs
, tiles ? true, Cocoa
{ lib
, callPackage
, CoreFoundation
, fetchFromGitHub
, fetchpatch
, pkgs
, wrapCDDA
, attachPkgs
, tiles ? true
, Cocoa
, debug ? false
, useXdgDir ? false
}:
@ -22,6 +30,13 @@ let
patches = [
# Unconditionally look for translation files in $out/share/locale
./locale-path-stable.patch
# Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083
# Remove with next version update.
(fetchpatch {
url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch";
hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA=";
})
];
makeFlags = common.makeFlags ++ [
@ -31,7 +46,7 @@ let
meta = common.meta // {
maintainers = with lib.maintainers;
common.meta.maintainers ++ [ skeidel ];
common.meta.maintainers ++ [ skeidel ];
};
});
in

4
pkgs/games/openxcom/default.nix
View File

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, libGLU
, libGL
, zlib
@ -25,7 +26,8 @@ stdenv.mkDerivation rec {
hash = "sha256-APv49ZT94oeM4KVKGtUdoQ1t8Ly8lsocr+FqXiRXbk0=";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ];
meta = with lib; {

11
pkgs/os-specific/linux/bpftools/default.nix
View File

@ -1,14 +1,19 @@
{ lib, stdenv
{ lib, stdenv, fetchurl
, libopcodes, libopcodes_2_38
, libbfd, libbfd_2_38
, elfutils, readline
, linuxPackages_latest, zlib
, zlib
, python3, bison, flex
}:
stdenv.mkDerivation rec {
pname = "bpftools";
inherit (linuxPackages_latest.kernel) version src;
version = "5.19.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1";
};
nativeBuildInputs = [ python3 bison flex ];
buildInputs = (if (lib.versionAtLeast version "5.20")

10
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -39,16 +39,6 @@
"sha256": "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys",
"version": "5.15.67"
},
"5.18": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.18.19-hardened1.patch",
"sha256": "1q61641b8lr87h04kjpd7izgi4kxdvknsn8ssmcs8n6fk6cswv8c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.19-hardened1/linux-hardened-5.18.19-hardened1.patch"
},
"sha256": "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z",
"version": "5.18.19"
},
"5.19": {
"patch": {
"extra": "-hardened1",

18
pkgs/os-specific/linux/kernel/linux-5.18.nix
View File

@ -1,18 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.18.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1mc8zhiw0v7fka64mydpdrxkrvy0jyqggq5lghw3pyqj2wjrpw6z";
};
} // (args.argsOverride or { }))

6
pkgs/os-specific/linux/zfs/default.nix
View File

@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
}:
let
@ -217,7 +217,7 @@ in {
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.19";
latestCompatibleLinuxPackages = linuxPackages_5_18;
latestCompatibleLinuxPackages = linuxPackages_5_15;
# this package should point to the latest release.
version = "2.1.5";
@ -228,7 +228,7 @@ in {
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.19";
latestCompatibleLinuxPackages = linuxPackages_5_18;
latestCompatibleLinuxPackages = linuxPackages_5_15;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the

6
pkgs/tools/misc/lnav/default.nix
View File

@ -15,19 +15,19 @@
stdenv.mkDerivation rec {
pname = "lnav";
version = "0.10.1";
version = "0.11.0";
src = fetchFromGitHub {
owner = "tstack";
repo = "lnav";
rev = "v${version}";
sha256 = "sha256-1b4mVKIUotMSK/ADHnpiM42G98JF0abL8sXXGFyS3sw=";
sha256 = "sha256-SkaJvIfFKD7xzxm3qnYUltKEpQRNNn6KkRwMP6eWte4=";
};
patches = [ ./0001-Forcefully-disable-docs-build.patch ];
postPatch = ''
substituteInPlace Makefile.am \
--replace "SUBDIRS = src test" "SUBDIRS = src"
--replace "SUBDIRS = tools src test" "SUBDIRS = tools src"
'';
enableParallelBuilding = true;

6
pkgs/tools/networking/minio-client/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "minio-client";
version = "2022-08-28T20-08-11Z";
version = "2022-09-16T09-16-47Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-1Cwvuyy0TRKNnhkpuXdr6ZenDa5pNjsOJA8/sczM22A=";
sha256 = "sha256-8oy61ueCXJTV58CxtsB8uiKS5NVaomICu8yQ1wSxl7s=";
};
vendorSha256 = "sha256-rGIy+qw+n/WCJ/3rviYjz9uffSP/rcJRvPda+Hm1G3s=";
vendorSha256 = "sha256-1jws2is/n3+l7ULTgBfO2glq4l9GzOP5AJ2wwhluQb8=";
subPackages = [ "." ];

1
pkgs/top-level/aliases.nix
View File

@ -915,6 +915,7 @@ mapAliases ({
multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
mumble_git = pkgs.mumble; # Added 2019-08-01
murmur_git = pkgs.murmur; # Added 2019-08-01
mutt-with-sidebar = mutt; # Added 2022-09-17
mysql-client = hiPrio mariadb.client;
mysql = mariadb; # moved from top-level 2021-03-14

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

@ -2554,7 +2554,9 @@ with pkgs;
github-commenter = callPackage ../development/tools/github-commenter { };
github-desktop = callPackage ../applications/version-management/github-desktop { };
github-desktop = callPackage ../applications/version-management/github-desktop {
curl = curl.override { openssl = openssl_1_1; };
};
github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
@ -24488,8 +24490,6 @@ with pkgs;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened;
linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened;
# Hardkernel (Odroid) kernels.
linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;
@ -29810,9 +29810,7 @@ with pkgs;
mmh = callPackage ../applications/networking/mailreaders/mmh { };
mutt = callPackage ../applications/networking/mailreaders/mutt { };
mutt-with-sidebar = mutt.override {
withSidebar = true;
};
mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
mutt-ics = callPackage ../tools/networking/mutt-ics { };

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

@ -168,12 +168,7 @@ in {
linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";
linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix {
kernelPatches = [
@ -195,7 +190,7 @@ in {
else testing;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
kernel = linux_5_18;
kernel = linux_5_19;
kernelPatches = kernel.kernelPatches;
};
@ -248,7 +243,7 @@ in {
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { };
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
}));
/* Linux kernel modules are inherently tied to a specific kernel. So
@ -533,7 +528,7 @@ in {
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18);
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
};
@ -573,7 +568,7 @@ in {
});
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { });
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);

2
pkgs/top-level/python-packages.nix
View File

@ -783,6 +783,8 @@ in {
astunparse = callPackage ../development/python-modules/astunparse { };
asyauth = callPackage ../development/python-modules/asyauth { };
async_generator = callPackage ../development/python-modules/async_generator { };
async-dns = callPackage ../development/python-modules/async-dns { };