mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
59156778b4
28 changed files with 1275 additions and 486 deletions
|
|
@ -122,10 +122,10 @@ let
|
||||||
done
|
done
|
||||||
|
|
||||||
if test -d ${pkg}/share/xsessions; then
|
if test -d ${pkg}/share/xsessions; then
|
||||||
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
|
${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
|
||||||
fi
|
fi
|
||||||
if test -d ${pkg}/share/wayland-sessions; then
|
if test -d ${pkg}/share/wayland-sessions; then
|
||||||
${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
|
${pkgs.buildPackages.xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
|
||||||
fi
|
fi
|
||||||
'') cfg.displayManager.sessionPackages}
|
'') cfg.displayManager.sessionPackages}
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.systemd;
|
cfg = config.systemd;
|
||||||
lndir = "${pkgs.xorg.lndir}/bin/lndir";
|
lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir";
|
||||||
in rec {
|
in rec {
|
||||||
|
|
||||||
shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
|
shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, fetchzip }:
|
{ lib, fetchzip }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.079";
|
version = "1.082";
|
||||||
in
|
in
|
||||||
fetchzip {
|
fetchzip {
|
||||||
name = "recursive-${version}";
|
name = "recursive-${version}";
|
||||||
|
|
@ -14,7 +14,7 @@ fetchzip {
|
||||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sha256 = "sha256-nRFjfbbZG9wDHGbGfS+wzViKF/ogWs8i/6OG0rkDHDg=";
|
sha256 = "1hjyjvzhfgqw58py4gk58fwyp5pxr3j8j76ppj6apg4dndfhs0lp";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://recursive.design/";
|
homepage = "https://recursive.design/";
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"commit": "73463ac080cd55650580d58fe80e5b2dcdfe5a7e",
|
"commit": "b60d5f4b773d16857c105718faad9699e145edcd",
|
||||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/73463ac080cd55650580d58fe80e5b2dcdfe5a7e.tar.gz",
|
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b60d5f4b773d16857c105718faad9699e145edcd.tar.gz",
|
||||||
"sha256": "1vwlpkrpfj6wdzlv4lwargyakyci81gri70z2jhkpvv3l6adc0gk",
|
"sha256": "19avxynbjhkhvjy5kcxgd3fp0b2nczsk213s1za488r6kksj90f5",
|
||||||
"msg": "Update from Hackage at 2021-10-15T10:42:20Z"
|
"msg": "Update from Hackage at 2021-10-18T14:27:09Z"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,7 @@ self: super: {
|
||||||
# These packages (and their reverse deps) cannot be built with profiling enabled.
|
# These packages (and their reverse deps) cannot be built with profiling enabled.
|
||||||
ghc-heap-view = disableLibraryProfiling super.ghc-heap-view;
|
ghc-heap-view = disableLibraryProfiling super.ghc-heap-view;
|
||||||
ghc-datasize = disableLibraryProfiling super.ghc-datasize;
|
ghc-datasize = disableLibraryProfiling super.ghc-datasize;
|
||||||
|
ghc-vis = disableLibraryProfiling super.ghc-vis;
|
||||||
|
|
||||||
# This test keeps being aborted because it runs too quietly for too long
|
# This test keeps being aborted because it runs too quietly for too long
|
||||||
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
|
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
|
||||||
|
|
@ -1272,22 +1273,18 @@ self: super: {
|
||||||
gi-cairo-render = doJailbreak super.gi-cairo-render;
|
gi-cairo-render = doJailbreak super.gi-cairo-render;
|
||||||
gi-cairo-connector = doJailbreak super.gi-cairo-connector;
|
gi-cairo-connector = doJailbreak super.gi-cairo-connector;
|
||||||
|
|
||||||
svgcairo = overrideCabal super.svgcairo (drv: {
|
svgcairo = appendPatches super.svgcairo [
|
||||||
patches = [
|
# Remove when https://github.com/gtk2hs/svgcairo/pull/12 goes in.
|
||||||
# Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged.
|
(pkgs.fetchpatch {
|
||||||
(pkgs.fetchpatch {
|
url = "https://github.com/gtk2hs/svgcairo/commit/348c60b99c284557a522baaf47db69322a0a8b67.patch";
|
||||||
url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch";
|
sha256 = "0akhq6klmykvqd5wsbdfnnl309f80ds19zgq06sh1mmggi54dnf3";
|
||||||
sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh";
|
})
|
||||||
})
|
# Remove when https://github.com/gtk2hs/svgcairo/pull/13 goes in.
|
||||||
# The update here breaks svgcairo:
|
(pkgs.fetchpatch {
|
||||||
# https://github.com/NixOS/nixpkgs/commit/08fcd73d9dc9a28aa901210b259d9bfb3c228018
|
url = "https://github.com/dalpd/svgcairo/commit/d1e0d7ae04c1edca83d5b782e464524cdda6ae85.patch";
|
||||||
# and updating the call to the header with the correct name fixes it.
|
sha256 = "1pq9ld9z67zsxj8vqjf82qwckcp69lvvnrjb7wsyb5jc6jaj3q0a";
|
||||||
(pkgs.fetchpatch {
|
})
|
||||||
url = "https://github.com/dalpd/svgcairo/commit/4dc6d8d3a6c24be0b8c1fd73b282ff247e7b1e6f.patch";
|
];
|
||||||
sha256 = "1pq9ld9z67zsxj8vqjf82qwckcp69lvvnrjb7wsyb5jc6jaj3q0a";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
|
|
||||||
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
|
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
|
||||||
# https://github.com/lehins/massiv/pull/104
|
# https://github.com/lehins/massiv/pull/104
|
||||||
|
|
@ -1827,6 +1824,21 @@ self: super: {
|
||||||
cabal-install-parsers = self.cabal-install-parsers_0_4_2;
|
cabal-install-parsers = self.cabal-install-parsers_0_4_2;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Build haskell-ci from git repository, including some useful fixes,
|
||||||
|
# e. g. required for generating the workflows for the cabal2nix repository
|
||||||
|
haskell-ci-unstable = (overrideSrc super.haskell-ci {
|
||||||
|
version = "0.13.20211011";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "haskell-CI";
|
||||||
|
repo = "haskell-ci";
|
||||||
|
rev = "c88e67e675bc4a990da53863c7fb42e67bcf9847";
|
||||||
|
sha256 = "1zhv1cg047lfyxfs3mvc73vv96pn240zaj7f2yl4lw5yj6y5rfk9";
|
||||||
|
};
|
||||||
|
}).overrideScope (self: super: {
|
||||||
|
attoparsec = self.attoparsec_0_14_1;
|
||||||
|
Cabal = self.Cabal_3_6_2_0;
|
||||||
|
});
|
||||||
|
|
||||||
Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: {
|
Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: {
|
||||||
# https://github.com/adamConnerSax/Frames-streamly/issues/1
|
# https://github.com/adamConnerSax/Frames-streamly/issues/1
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
|
|
@ -2054,4 +2066,9 @@ EOT
|
||||||
# https://github.com/recursion-schemes/recursion-schemes/issues/128
|
# https://github.com/recursion-schemes/recursion-schemes/issues/128
|
||||||
recursion-schemes = appendPatch super.recursion-schemes ./patches/recursion-schemes-128.patch;
|
recursion-schemes = appendPatch super.recursion-schemes ./patches/recursion-schemes-128.patch;
|
||||||
|
|
||||||
|
# Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release
|
||||||
|
# Can't use fetchpatch as it required tweaking the line endings as the .cabal
|
||||||
|
# file revision on hackage was gifted CRLF line endings
|
||||||
|
gogol-core = appendPatch super.gogol-core ./patches/gogol-core-144.patch;
|
||||||
|
|
||||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||||
|
|
|
||||||
|
|
@ -75,6 +75,8 @@ self: super: {
|
||||||
weeder = self.weeder_2_3_0;
|
weeder = self.weeder_2_3_0;
|
||||||
generic-lens-core = self.generic-lens-core_2_2_0_0;
|
generic-lens-core = self.generic-lens-core_2_2_0_0;
|
||||||
generic-lens = self.generic-lens_2_2_0_0;
|
generic-lens = self.generic-lens_2_2_0_0;
|
||||||
|
th-desugar = self.th-desugar_1_12;
|
||||||
|
autoapply = self.autoapply_0_4_1_1;
|
||||||
|
|
||||||
# Doesn't allow Dhall 1.39.*
|
# Doesn't allow Dhall 1.39.*
|
||||||
weeder_2_3_0 = super.weeder_2_3_0.override {
|
weeder_2_3_0 = super.weeder_2_3_0.override {
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ self: super: {
|
||||||
# Tests fail because of typechecking changes
|
# Tests fail because of typechecking changes
|
||||||
conduit = dontCheck super.conduit;
|
conduit = dontCheck super.conduit;
|
||||||
|
|
||||||
constraints = appendPatch super.constraints (pkgs.fetchpatch {
|
constraints = appendPatch (doJailbreak super.constraints) (pkgs.fetchpatch {
|
||||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch";
|
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch";
|
||||||
sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3";
|
sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3";
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1299,7 +1299,6 @@ broken-packages:
|
||||||
- event-driven
|
- event-driven
|
||||||
- eventful-dynamodb
|
- eventful-dynamodb
|
||||||
- eventful-sql-common
|
- eventful-sql-common
|
||||||
- eventlog2html
|
|
||||||
- eventloop
|
- eventloop
|
||||||
- eventstore
|
- eventstore
|
||||||
- ewe
|
- ewe
|
||||||
|
|
@ -1341,6 +1340,7 @@ broken-packages:
|
||||||
- ez-couch
|
- ez-couch
|
||||||
- Facebook-Password-Hacker-Online-Latest-Version
|
- Facebook-Password-Hacker-Online-Latest-Version
|
||||||
- faceted
|
- faceted
|
||||||
|
- factory
|
||||||
- facts
|
- facts
|
||||||
- fadno-braids
|
- fadno-braids
|
||||||
- failable-list
|
- failable-list
|
||||||
|
|
@ -1409,6 +1409,7 @@ broken-packages:
|
||||||
- fingertree-tf
|
- fingertree-tf
|
||||||
- finitary-derive
|
- finitary-derive
|
||||||
- firefly-example
|
- firefly-example
|
||||||
|
- firestore
|
||||||
- first-and-last
|
- first-and-last
|
||||||
- first-class-instances
|
- first-class-instances
|
||||||
- fit
|
- fit
|
||||||
|
|
@ -1655,7 +1656,6 @@ broken-packages:
|
||||||
- ghc-tcplugin-api
|
- ghc-tcplugin-api
|
||||||
- ghc-time-alloc-prof
|
- ghc-time-alloc-prof
|
||||||
- ghc-usage
|
- ghc-usage
|
||||||
- ghc-vis
|
|
||||||
- gh-labeler
|
- gh-labeler
|
||||||
- giak
|
- giak
|
||||||
- Gifcurry
|
- Gifcurry
|
||||||
|
|
@ -1717,7 +1717,20 @@ broken-packages:
|
||||||
- gochan
|
- gochan
|
||||||
- godot-haskell
|
- godot-haskell
|
||||||
- gofer-prelude
|
- gofer-prelude
|
||||||
- gogol-core
|
- gogol-admin-emailmigration
|
||||||
|
- gogol-affiliates
|
||||||
|
- gogol-autoscaler
|
||||||
|
- gogol-bigtableadmin
|
||||||
|
- gogol-cloudmonitoring
|
||||||
|
- gogol-freebasesearch
|
||||||
|
- gogol-latencytest
|
||||||
|
- gogol-maps-coordinate
|
||||||
|
- gogol-maps-engine
|
||||||
|
- gogol-photoslibrary
|
||||||
|
- gogol-resourceviews
|
||||||
|
- gogol-servicemanagement
|
||||||
|
- gogol-taskqueue
|
||||||
|
- gogol-useraccounts
|
||||||
- gooey
|
- gooey
|
||||||
- google-cloud
|
- google-cloud
|
||||||
- GoogleCodeJam
|
- GoogleCodeJam
|
||||||
|
|
@ -4388,9 +4401,12 @@ broken-packages:
|
||||||
- shorten-strings
|
- shorten-strings
|
||||||
- short-vec
|
- short-vec
|
||||||
- show-prettyprint
|
- show-prettyprint
|
||||||
|
- Shpadoinkle-backend-pardiff
|
||||||
- Shpadoinkle-backend-snabbdom
|
- Shpadoinkle-backend-snabbdom
|
||||||
- Shpadoinkle-isreal
|
- Shpadoinkle-isreal
|
||||||
- Shpadoinkle-streaming
|
- Shpadoinkle-streaming
|
||||||
|
- Shpadoinkle-template
|
||||||
|
- Shpadoinkle-widgets
|
||||||
- shwifty
|
- shwifty
|
||||||
- sifflet
|
- sifflet
|
||||||
- sifflet-lib
|
- sifflet-lib
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,12 @@ default-package-overrides:
|
||||||
- hiedb == 0.4.0.*
|
- hiedb == 0.4.0.*
|
||||||
# 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes
|
# 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes
|
||||||
- weeder < 2.3.0
|
- weeder < 2.3.0
|
||||||
|
# 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0
|
||||||
|
- taskwarrior < 0.4.0.0
|
||||||
|
# 2021-10-19: autoapply 0.4.1.1 requires th-desugar 1.12
|
||||||
|
- autoapply < 0.4.1.1
|
||||||
|
# 2021-10-22: 1.8 breaks shake-bench
|
||||||
|
- SVGFonts < 1.8
|
||||||
|
|
||||||
extra-packages:
|
extra-packages:
|
||||||
- base16-bytestring < 1 # required for cabal-install etc.
|
- base16-bytestring < 1 # required for cabal-install etc.
|
||||||
|
|
@ -150,6 +156,7 @@ package-maintainers:
|
||||||
- spago
|
- spago
|
||||||
- termonad
|
- termonad
|
||||||
dalpd:
|
dalpd:
|
||||||
|
- ghc-vis
|
||||||
- svgcairo
|
- svgcairo
|
||||||
domenkozar:
|
domenkozar:
|
||||||
- cachix
|
- cachix
|
||||||
|
|
|
||||||
|
|
@ -331,6 +331,7 @@ dont-distribute-packages:
|
||||||
- Shellac-haskeline
|
- Shellac-haskeline
|
||||||
- Shellac-readline
|
- Shellac-readline
|
||||||
- ShortestPathProblems
|
- ShortestPathProblems
|
||||||
|
- Shpadoinkle-developer-tools
|
||||||
- Shpadoinkle-disembodied
|
- Shpadoinkle-disembodied
|
||||||
- Shpadoinkle-examples
|
- Shpadoinkle-examples
|
||||||
- Shpadoinkle-router
|
- Shpadoinkle-router
|
||||||
|
|
@ -1118,6 +1119,7 @@ dont-distribute-packages:
|
||||||
- findhttp
|
- findhttp
|
||||||
- finite-table
|
- finite-table
|
||||||
- firstify
|
- firstify
|
||||||
|
- fishfood
|
||||||
- fix-parser-simple
|
- fix-parser-simple
|
||||||
- fixed-point-vector
|
- fixed-point-vector
|
||||||
- fixed-point-vector-space
|
- fixed-point-vector-space
|
||||||
|
|
@ -1262,188 +1264,6 @@ dont-distribute-packages:
|
||||||
- goal-probability
|
- goal-probability
|
||||||
- goal-simulation
|
- goal-simulation
|
||||||
- goat
|
- goat
|
||||||
- gogol
|
|
||||||
- gogol-abusiveexperiencereport
|
|
||||||
- gogol-acceleratedmobilepageurl
|
|
||||||
- gogol-accessapproval
|
|
||||||
- gogol-accesscontextmanager
|
|
||||||
- gogol-adexchange-buyer
|
|
||||||
- gogol-adexchange-seller
|
|
||||||
- gogol-adexchangebuyer2
|
|
||||||
- gogol-adexperiencereport
|
|
||||||
- gogol-admin-datatransfer
|
|
||||||
- gogol-admin-directory
|
|
||||||
- gogol-admin-emailmigration
|
|
||||||
- gogol-admin-reports
|
|
||||||
- gogol-adsense
|
|
||||||
- gogol-adsense-host
|
|
||||||
- gogol-affiliates
|
|
||||||
- gogol-alertcenter
|
|
||||||
- gogol-analytics
|
|
||||||
- gogol-analyticsreporting
|
|
||||||
- gogol-android-enterprise
|
|
||||||
- gogol-android-publisher
|
|
||||||
- gogol-androiddeviceprovisioning
|
|
||||||
- gogol-androidmanagement
|
|
||||||
- gogol-appengine
|
|
||||||
- gogol-apps-activity
|
|
||||||
- gogol-apps-calendar
|
|
||||||
- gogol-apps-licensing
|
|
||||||
- gogol-apps-reseller
|
|
||||||
- gogol-apps-tasks
|
|
||||||
- gogol-appstate
|
|
||||||
- gogol-autoscaler
|
|
||||||
- gogol-bigquery
|
|
||||||
- gogol-bigquerydatatransfer
|
|
||||||
- gogol-bigtableadmin
|
|
||||||
- gogol-billing
|
|
||||||
- gogol-binaryauthorization
|
|
||||||
- gogol-blogger
|
|
||||||
- gogol-books
|
|
||||||
- gogol-chat
|
|
||||||
- gogol-civicinfo
|
|
||||||
- gogol-classroom
|
|
||||||
- gogol-cloudasset
|
|
||||||
- gogol-clouderrorreporting
|
|
||||||
- gogol-cloudfunctions
|
|
||||||
- gogol-cloudidentity
|
|
||||||
- gogol-cloudiot
|
|
||||||
- gogol-cloudkms
|
|
||||||
- gogol-cloudmonitoring
|
|
||||||
- gogol-cloudprivatecatalog
|
|
||||||
- gogol-cloudprivatecatalogproducer
|
|
||||||
- gogol-cloudprofiler
|
|
||||||
- gogol-cloudscheduler
|
|
||||||
- gogol-cloudsearch
|
|
||||||
- gogol-cloudshell
|
|
||||||
- gogol-cloudtasks
|
|
||||||
- gogol-cloudtrace
|
|
||||||
- gogol-commentanalyzer
|
|
||||||
- gogol-composer
|
|
||||||
- gogol-compute
|
|
||||||
- gogol-consumersurveys
|
|
||||||
- gogol-container
|
|
||||||
- gogol-containeranalysis
|
|
||||||
- gogol-containerbuilder
|
|
||||||
- gogol-customsearch
|
|
||||||
- gogol-dataflow
|
|
||||||
- gogol-datafusion
|
|
||||||
- gogol-dataproc
|
|
||||||
- gogol-datastore
|
|
||||||
- gogol-debugger
|
|
||||||
- gogol-deploymentmanager
|
|
||||||
- gogol-dfareporting
|
|
||||||
- gogol-dialogflow
|
|
||||||
- gogol-digitalassetlinks
|
|
||||||
- gogol-discovery
|
|
||||||
- gogol-dlp
|
|
||||||
- gogol-dns
|
|
||||||
- gogol-docs
|
|
||||||
- gogol-doubleclick-bids
|
|
||||||
- gogol-doubleclick-search
|
|
||||||
- gogol-drive
|
|
||||||
- gogol-driveactivity
|
|
||||||
- gogol-factchecktools
|
|
||||||
- gogol-file
|
|
||||||
- gogol-firebase-dynamiclinks
|
|
||||||
- gogol-firebase-rules
|
|
||||||
- gogol-firebasehosting
|
|
||||||
- gogol-firebaseremoteconfig
|
|
||||||
- gogol-firestore
|
|
||||||
- gogol-fitness
|
|
||||||
- gogol-fonts
|
|
||||||
- gogol-freebasesearch
|
|
||||||
- gogol-fusiontables
|
|
||||||
- gogol-games
|
|
||||||
- gogol-games-configuration
|
|
||||||
- gogol-games-management
|
|
||||||
- gogol-genomics
|
|
||||||
- gogol-gmail
|
|
||||||
- gogol-groups-migration
|
|
||||||
- gogol-groups-settings
|
|
||||||
- gogol-healthcare
|
|
||||||
- gogol-iam
|
|
||||||
- gogol-iamcredentials
|
|
||||||
- gogol-iap
|
|
||||||
- gogol-identity-toolkit
|
|
||||||
- gogol-indexing
|
|
||||||
- gogol-jobs
|
|
||||||
- gogol-kgsearch
|
|
||||||
- gogol-language
|
|
||||||
- gogol-latencytest
|
|
||||||
- gogol-libraryagent
|
|
||||||
- gogol-logging
|
|
||||||
- gogol-manufacturers
|
|
||||||
- gogol-maps-coordinate
|
|
||||||
- gogol-maps-engine
|
|
||||||
- gogol-mirror
|
|
||||||
- gogol-ml
|
|
||||||
- gogol-monitoring
|
|
||||||
- gogol-oauth2
|
|
||||||
- gogol-oslogin
|
|
||||||
- gogol-pagespeed
|
|
||||||
- gogol-partners
|
|
||||||
- gogol-people
|
|
||||||
- gogol-photoslibrary
|
|
||||||
- gogol-play-moviespartner
|
|
||||||
- gogol-playcustomapp
|
|
||||||
- gogol-plus
|
|
||||||
- gogol-plus-domains
|
|
||||||
- gogol-poly
|
|
||||||
- gogol-prediction
|
|
||||||
- gogol-proximitybeacon
|
|
||||||
- gogol-pubsub
|
|
||||||
- gogol-qpxexpress
|
|
||||||
- gogol-redis
|
|
||||||
- gogol-remotebuildexecution
|
|
||||||
- gogol-replicapool
|
|
||||||
- gogol-replicapool-updater
|
|
||||||
- gogol-resourcemanager
|
|
||||||
- gogol-resourceviews
|
|
||||||
- gogol-run
|
|
||||||
- gogol-runtimeconfig
|
|
||||||
- gogol-safebrowsing
|
|
||||||
- gogol-script
|
|
||||||
- gogol-searchconsole
|
|
||||||
- gogol-securitycenter
|
|
||||||
- gogol-servicebroker
|
|
||||||
- gogol-serviceconsumermanagement
|
|
||||||
- gogol-servicecontrol
|
|
||||||
- gogol-servicemanagement
|
|
||||||
- gogol-servicenetworking
|
|
||||||
- gogol-serviceusage
|
|
||||||
- gogol-serviceuser
|
|
||||||
- gogol-sheets
|
|
||||||
- gogol-shopping-content
|
|
||||||
- gogol-siteverification
|
|
||||||
- gogol-slides
|
|
||||||
- gogol-sourcerepo
|
|
||||||
- gogol-spanner
|
|
||||||
- gogol-spectrum
|
|
||||||
- gogol-speech
|
|
||||||
- gogol-sqladmin
|
|
||||||
- gogol-storage
|
|
||||||
- gogol-storage-transfer
|
|
||||||
- gogol-streetviewpublish
|
|
||||||
- gogol-surveys
|
|
||||||
- gogol-tagmanager
|
|
||||||
- gogol-taskqueue
|
|
||||||
- gogol-testing
|
|
||||||
- gogol-texttospeech
|
|
||||||
- gogol-toolresults
|
|
||||||
- gogol-tpu
|
|
||||||
- gogol-tracing
|
|
||||||
- gogol-translate
|
|
||||||
- gogol-urlshortener
|
|
||||||
- gogol-useraccounts
|
|
||||||
- gogol-vault
|
|
||||||
- gogol-videointelligence
|
|
||||||
- gogol-vision
|
|
||||||
- gogol-webmaster-tools
|
|
||||||
- gogol-websecurityscanner
|
|
||||||
- gogol-youtube
|
|
||||||
- gogol-youtube-analytics
|
|
||||||
- gogol-youtube-reporting
|
|
||||||
- google-drive
|
- google-drive
|
||||||
- google-mail-filters
|
- google-mail-filters
|
||||||
- google-maps-geocoding
|
- google-maps-geocoding
|
||||||
|
|
@ -3051,6 +2871,7 @@ dont-distribute-packages:
|
||||||
- sql-simple-postgresql
|
- sql-simple-postgresql
|
||||||
- sql-simple-sqlite
|
- sql-simple-sqlite
|
||||||
- sqlite-simple-typed
|
- sqlite-simple-typed
|
||||||
|
- squeeze
|
||||||
- sr-extra
|
- sr-extra
|
||||||
- sscgi
|
- sscgi
|
||||||
- sshd-lint
|
- sshd-lint
|
||||||
|
|
|
||||||
807
pkgs/development/haskell-modules/hackage-packages.nix
generated
807
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,26 @@
|
||||||
|
diff --git a/gogol-core.cabal b/gogol-core.cabal
|
||||||
|
index 4c47988..caa4796 100644
|
||||||
|
--- a/gogol-core.cabal
|
||||||
|
+++ b/gogol-core.cabal
|
||||||
|
@@ -62,7 +62,7 @@ library
|
||||||
|
, lens >= 4.4
|
||||||
|
, resourcet >= 1.1
|
||||||
|
, scientific >= 0.3
|
||||||
|
- , servant >= 0.4.4
|
||||||
|
+ , servant >= 0.14.1
|
||||||
|
, text >= 1.1
|
||||||
|
, unordered-containers >= 0.2.5
|
||||||
|
|
||||||
|
diff --git a/src/Network/Google/Prelude.hs b/src/Network/Google/Prelude.hs
|
||||||
|
index a4ad9de..795c690 100644
|
||||||
|
--- a/src/Network/Google/Prelude.hs
|
||||||
|
+++ b/src/Network/Google/Prelude.hs
|
||||||
|
@@ -28,7 +28,7 @@ import Network.HTTP.Client as Export (RequestBody)
|
||||||
|
import Numeric.Natural as Export (Natural)
|
||||||
|
import Prelude as Export hiding (product, span, any, Word)
|
||||||
|
import Servant.API as Export hiding (Headers, Link, getResponse, Stream, ResponseHeader, Header, header)
|
||||||
|
-import Servant.Utils.Links as Export hiding (Link)
|
||||||
|
+import Servant.Links as Export hiding (Link)
|
||||||
|
import Web.HttpApiData as Export (FromHttpApiData (..), ToHttpApiData (..))
|
||||||
|
|
||||||
|
import Network.Google.Data.Bytes as Export
|
||||||
47
pkgs/development/libraries/libbpkg/default.nix
Normal file
47
pkgs/development/libraries/libbpkg/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, libbutl
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "libbpkg";
|
||||||
|
version = "0.13.0";
|
||||||
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
|
||||||
|
sha256 = "732849cdd5d773c589dd0ac220002fa41424784df10617adc4dea729faafb22b";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
build2
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
libbutl
|
||||||
|
];
|
||||||
|
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||||
|
];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "build2 package dependency manager utility library";
|
||||||
|
longDescription = ''
|
||||||
|
This library defines the types and utilities for working with build2 packages.
|
||||||
|
In particular, it provides C++ classes as well as the parser and serializer
|
||||||
|
implementations that can be used to read, manipulate, and write package,
|
||||||
|
repository and signature manifests.
|
||||||
|
'';
|
||||||
|
homepage = "https://build2.org/";
|
||||||
|
changelog = "https://git.build2.org/cgit/libbpkg/log";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ r-burns ];
|
||||||
|
};
|
||||||
|
}
|
||||||
54
pkgs/development/libraries/libbutl/default.nix
Normal file
54
pkgs/development/libraries/libbutl/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, libuuid
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "libbutl";
|
||||||
|
version = "0.13.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
|
||||||
|
sha256 = "d7944637ab4a17d3a299c04ff6f146e89b2a0f433ddd9d08d8632a25bae9c9cb";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
build2
|
||||||
|
];
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
# Should be true for anything built with build2,
|
||||||
|
# but especially important when bootstrapping
|
||||||
|
disallowedReferences = [ build2 ];
|
||||||
|
|
||||||
|
postPatch = lib.optionalString stdenv.isLinux ''
|
||||||
|
substituteInPlace libbutl/uuid-linux.cxx \
|
||||||
|
--replace '"libuuid.so' '"${lib.getLib libuuid}/lib/libuuid.so'
|
||||||
|
'';
|
||||||
|
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||||
|
];
|
||||||
|
|
||||||
|
# tests broken with -DNDEBUG
|
||||||
|
# https://github.com/build2/libbutl/issues/4
|
||||||
|
# doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "build2 utility library";
|
||||||
|
longDescription = ''
|
||||||
|
This library is a collection of utilities that are used throughout the
|
||||||
|
build2 toolchain.
|
||||||
|
'';
|
||||||
|
homepage = "https://build2.org/";
|
||||||
|
changelog = "https://git.build2.org/cgit/libbutl/log";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ r-burns ];
|
||||||
|
};
|
||||||
|
}
|
||||||
56
pkgs/development/libraries/libodb-sqlite/default.nix
Normal file
56
pkgs/development/libraries/libodb-sqlite/default.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, libodb
|
||||||
|
, sqlite
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "libodb-sqlite";
|
||||||
|
version = "2.5.0-b.19";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
|
||||||
|
sha256 = "9443653bfc31d02d0d723f18072f6b04083d090e6580844e33c1e769db122494";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
build2
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
libodb
|
||||||
|
];
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
sqlite
|
||||||
|
];
|
||||||
|
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "SQLite ODB runtime library";
|
||||||
|
longDescription = ''
|
||||||
|
ODB is an object-relational mapping (ORM) system for C++. It provides
|
||||||
|
tools, APIs, and library support that allow you to persist C++ objects
|
||||||
|
to a relational database (RDBMS) without having to deal with tables,
|
||||||
|
columns, or SQL and without manually writing any of the mapping code.
|
||||||
|
For more information see:
|
||||||
|
|
||||||
|
http://www.codesynthesis.com/products/odb/
|
||||||
|
|
||||||
|
This package contains the SQLite ODB runtime library. Every application
|
||||||
|
that includes code generated for the SQLite database will need to link
|
||||||
|
to this library.
|
||||||
|
'';
|
||||||
|
homepage = "https://www.codesynthesis.com/products/odb/";
|
||||||
|
changelog = "https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS";
|
||||||
|
license = licenses.gpl2Only;
|
||||||
|
maintainers = with maintainers; [ r-burns ];
|
||||||
|
};
|
||||||
|
}
|
||||||
45
pkgs/development/libraries/libodb/default.nix
Normal file
45
pkgs/development/libraries/libodb/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "libodb";
|
||||||
|
version = "2.5.0-b.19";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "doc" ];
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
|
||||||
|
sha256 = "8180d9d40d8e74ed25b1712953f19379a29abdee3896ae98ba9ade35846adb39";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ build2 ];
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Common ODB runtime library";
|
||||||
|
longDescription = ''
|
||||||
|
ODB is an object-relational mapping (ORM) system for C++. It provides
|
||||||
|
tools, APIs, and library support that allow you to persist C++ objects
|
||||||
|
to a relational database (RDBMS) without having to deal with tables,
|
||||||
|
columns, or SQL and without manually writing any of the mapping code.
|
||||||
|
For more information see:
|
||||||
|
|
||||||
|
http://www.codesynthesis.com/products/odb/
|
||||||
|
|
||||||
|
This package contains the common ODB runtime library. Every application
|
||||||
|
that includes code generated by the ODB compiler will need to link to
|
||||||
|
this library.
|
||||||
|
'';
|
||||||
|
homepage = "https://www.codesynthesis.com/products/odb/";
|
||||||
|
changelog = "https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS";
|
||||||
|
license = licenses.gpl2Only;
|
||||||
|
maintainers = with maintainers; [ r-burns ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc=";
|
sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# This patch should be obsolete and should stop applying the in next release.
|
||||||
|
patches = [ ./fix-compilation-with-olm-3.2.5.patch ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
# Network requiring tests can't be disabled individually:
|
# Network requiring tests can't be disabled individually:
|
||||||
# https://github.com/Nheko-Reborn/mtxclient/issues/22
|
# https://github.com/Nheko-Reborn/mtxclient/issues/22
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
diff -Naur old/lib/crypto/client.cpp c5pf6ygk9v9rdwwr3dyd24wghflp0vmx-source/lib/crypto/client.cpp
|
||||||
|
--- old/lib/crypto/client.cpp 2021-10-22 19:31:52.159836190 +0300
|
||||||
|
+++ c5pf6ygk9v9rdwwr3dyd24wghflp0vmx-source/lib/crypto/client.cpp 2021-10-22 19:30:42.882010441 +0300
|
||||||
|
@@ -37,15 +37,15 @@
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
-OlmErrorCode
|
||||||
|
+mtx::crypto::OlmErrorCode
|
||||||
|
olm_exception::ec_from_string(std::string_view error)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < olmErrorStrings.size(); i++) {
|
||||||
|
if (olmErrorStrings[i] == error)
|
||||||
|
- return static_cast<OlmErrorCode>(i);
|
||||||
|
+ return static_cast<mtx::crypto::OlmErrorCode>(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
- return OlmErrorCode::UNKNOWN_ERROR;
|
||||||
|
+ return mtx::crypto::OlmErrorCode::UNKNOWN_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
49
pkgs/development/tools/build-managers/build2/bdep.nix
Normal file
49
pkgs/development/tools/build-managers/build2/bdep.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, libbpkg
|
||||||
|
, libbutl
|
||||||
|
, libodb
|
||||||
|
, libodb-sqlite
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "bdep";
|
||||||
|
version = "0.13.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "doc" "man" ];
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz";
|
||||||
|
sha256 = "8e11b469d875d05c4eb7a228416b78a61c68a49310e5e41db78ed6d048f6ba2a";
|
||||||
|
};
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
nativeBuildInputs = [
|
||||||
|
build2
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
libbpkg
|
||||||
|
libbutl
|
||||||
|
libodb
|
||||||
|
libodb-sqlite
|
||||||
|
];
|
||||||
|
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "build2 project dependency manager";
|
||||||
|
# https://build2.org/bdep/doc/bdep.xhtml
|
||||||
|
longDescription = ''
|
||||||
|
The build2 project dependency manager is used to manage the dependencies
|
||||||
|
of a project during development.
|
||||||
|
'';
|
||||||
|
homepage = "https://build2.org/";
|
||||||
|
changelog = "https://git.build2.org/cgit/bdep/tree/NEWS";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ r-burns ];
|
||||||
|
};
|
||||||
|
}
|
||||||
44
pkgs/development/tools/build-managers/build2/bootstrap.nix
Normal file
44
pkgs/development/tools/build-managers/build2/bootstrap.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, pkgs
|
||||||
|
, fixDarwinDylibNames
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "build2-bootstrap";
|
||||||
|
version = "0.13.0";
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
|
||||||
|
sha256 = "01hmr5y8aa28qchwy9ci8x5q746flwxmlxarmy4w9zay9nmvryms";
|
||||||
|
};
|
||||||
|
patches = [
|
||||||
|
# Pick up sysdirs from NIX_LDFLAGS
|
||||||
|
./nix-ldflags-sysdirs.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
sourceRoot = "build2-toolchain-${version}/build2";
|
||||||
|
makefile = "bootstrap.gmake";
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
|
propagatedBuildInputs = lib.optionals stdenv.targetPlatform.isDarwin [
|
||||||
|
fixDarwinDylibNames
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
build2/b-boot --version
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -D build2/b-boot $out/bin/b
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
inherit (pkgs.build2) passthru;
|
||||||
|
}
|
||||||
63
pkgs/development/tools/build-managers/build2/bpkg.nix
Normal file
63
pkgs/development/tools/build-managers/build2/bpkg.nix
Normal file
|
|
@ -0,0 +1,63 @@
|
||||||
|
{ lib, stdenv
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, git
|
||||||
|
, libbpkg
|
||||||
|
, libbutl
|
||||||
|
, libodb
|
||||||
|
, libodb-sqlite
|
||||||
|
, openssl
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "bpkg";
|
||||||
|
version = "0.13.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "doc" "man" ];
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz";
|
||||||
|
sha256 = "fec41e171c8ea7967bfc44850568cd624def544fd866c383bd413c5b4349e282";
|
||||||
|
};
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
nativeBuildInputs = [
|
||||||
|
build2
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
libbpkg
|
||||||
|
libbutl
|
||||||
|
libodb
|
||||||
|
libodb-sqlite
|
||||||
|
];
|
||||||
|
checkInputs = [
|
||||||
|
git
|
||||||
|
openssl
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = !stdenv.isDarwin; # tests hang
|
||||||
|
|
||||||
|
# Failing test
|
||||||
|
postPatch = ''
|
||||||
|
rm tests/rep-create.testscript
|
||||||
|
'';
|
||||||
|
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${build2.configSharedStatic enableShared enableStatic}"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "build2 package dependency manager";
|
||||||
|
# https://build2.org/bpkg/doc/bpkg.xhtml
|
||||||
|
longDescription = ''
|
||||||
|
The build2 package dependency manager is used to manipulate build
|
||||||
|
configurations, packages, and repositories.
|
||||||
|
'';
|
||||||
|
homepage = "https://build2.org/";
|
||||||
|
changelog = "https://git.build2.org/cgit/bpkg/tree/NEWS";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ r-burns ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,23 +1,86 @@
|
||||||
{ stdenv, lib, fetchurl }:
|
{ stdenv, lib
|
||||||
|
, build2
|
||||||
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
|
, fixDarwinDylibNames
|
||||||
|
, libbutl
|
||||||
|
, libpkgconf
|
||||||
|
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||||
|
, enableStatic ? !enableShared
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
configSharedStatic = enableShared: enableStatic:
|
||||||
|
if enableShared && enableStatic then "both"
|
||||||
|
else if enableShared then "shared"
|
||||||
|
else if enableStatic then "static"
|
||||||
|
else throw "neither shared nor static libraries requested";
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "build2";
|
pname = "build2";
|
||||||
version = "0.13.0";
|
version = "0.13.0";
|
||||||
|
|
||||||
|
outputs = [ "out" "dev" "doc" "man" ];
|
||||||
|
|
||||||
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
|
url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
|
||||||
sha256 = "01hmr5y8aa28qchwy9ci8x5q746flwxmlxarmy4w9zay9nmvryms";
|
sha256 = "aff53a87c23534e0232b5cf746e0be4b2aaa840c3de4e668b98e382a3973c45e";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontConfigure = true;
|
patches = [
|
||||||
dontInstall = true;
|
# Remove any build/host config entries which refer to nix store paths
|
||||||
|
./remove-config-store-paths.patch
|
||||||
|
# Pick up sysdirs from NIX_LDFLAGS
|
||||||
|
./nix-ldflags-sysdirs.patch
|
||||||
|
# Fix stray '-l' linker flags in pkg-config files (remove in next release)
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/build2/build2/commit/d51892e33a0fe69e743e02d9620312133a7ac61d.patch";
|
||||||
|
sha256 = "0xzm084bxnfi8lqng0cwxvz8ylbfzk0didbr2wf385gssv4fva81";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
buildPhase = ''
|
strictDeps = true;
|
||||||
runHook preBuild
|
nativeBuildInputs = [
|
||||||
./build.sh --local --trust yes --install-dir "$out" "$CXX"
|
build2
|
||||||
runHook postBuild
|
];
|
||||||
|
disallowedReferences = [
|
||||||
|
build2
|
||||||
|
libbutl.dev
|
||||||
|
libpkgconf.dev
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
libbutl
|
||||||
|
libpkgconf
|
||||||
|
];
|
||||||
|
|
||||||
|
# Build2 uses @rpath on darwin
|
||||||
|
# https://github.com/build2/build2/issues/166
|
||||||
|
# N.B. this only adjusts the install_name after all libraries are installed;
|
||||||
|
# packages containing multiple interdependent libraries may have
|
||||||
|
# LC_LOAD_DYLIB entries containing @rpath, requiring manual fixup
|
||||||
|
propagatedBuildInputs = lib.optionals stdenv.targetPlatform.isDarwin [
|
||||||
|
fixDarwinDylibNames
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs --build tests/bash/testscript
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
build2ConfigureFlags = [
|
||||||
|
"config.bin.lib=${configSharedStatic enableShared enableStatic}"
|
||||||
|
"config.cc.poptions+=-I${lib.getDev libpkgconf}/include/pkgconf"
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||||
|
install_name_tool -add_rpath "''${!outputLib}/lib" "''${!outputBin}/bin/b"
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
bootstrap = build2;
|
||||||
|
inherit configSharedStatic;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://www.build2.org/";
|
homepage = "https://www.build2.org/";
|
||||||
description = "build2 build system";
|
description = "build2 build system";
|
||||||
|
|
@ -34,6 +97,7 @@ stdenv.mkDerivation rec {
|
||||||
at C/C++ projects as well as mixed-language projects involving
|
at C/C++ projects as well as mixed-language projects involving
|
||||||
one of these languages (see bash and rust modules, for example).
|
one of these languages (see bash and rust modules, for example).
|
||||||
'';
|
'';
|
||||||
|
changelog = "https://git.build2.org/cgit/build2/tree/NEWS";
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ hiro98 r-burns ];
|
maintainers = with maintainers; [ hiro98 r-burns ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
|
||||||
|
index f848003c..0f14f9a5 100644
|
||||||
|
--- a/libbuild2/cc/common.cxx
|
||||||
|
+++ b/libbuild2/cc/common.cxx
|
||||||
|
@@ -966,6 +966,17 @@ namespace build2
|
||||||
|
void
|
||||||
|
msvc_extract_library_search_dirs (const strings&, dir_paths&); // msvc.cxx
|
||||||
|
|
||||||
|
+ static strings split (const string& s, const char delim) {
|
||||||
|
+ stringstream ss (s);
|
||||||
|
+ string item;
|
||||||
|
+ strings result;
|
||||||
|
+
|
||||||
|
+ while (getline (ss, item, delim)) {
|
||||||
|
+ result.push_back (item);
|
||||||
|
+ }
|
||||||
|
+ return result;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
dir_paths common::
|
||||||
|
extract_library_search_dirs (const scope& bs) const
|
||||||
|
{
|
||||||
|
@@ -987,8 +998,19 @@ namespace build2
|
||||||
|
msvc_extract_library_search_dirs (v, r);
|
||||||
|
else
|
||||||
|
gcc_extract_library_search_dirs (v, r);
|
||||||
|
+
|
||||||
|
};
|
||||||
|
|
||||||
|
+ // NIX_LDFLAGS are implicitly used when linking,
|
||||||
|
+ // so its -L flags effectively specify system dirs.
|
||||||
|
+ // However, they are only enabled when actually linking and are thus
|
||||||
|
+ // not detected by build2, so we need to manually pick them up here.
|
||||||
|
+ if (auto s = getenv ("NIX_LDFLAGS")) {
|
||||||
|
+ // TODO: do we need more robust args splitting here? e.g. shlex.split
|
||||||
|
+ auto args = split (s.value (), ' ');
|
||||||
|
+ gcc_extract_library_search_dirs (args, r);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
// Note that the compiler mode options are in sys_lib_dirs.
|
||||||
|
//
|
||||||
|
if (auto l = bs[c_loptions]) extract (*l, c_loptions);
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
--- a/libbuild2/buildfile
|
||||||
|
+++ b/libbuild2/buildfile
|
||||||
|
@@ -68,7 +68,11 @@ config/cxx{host-config}: config/in{host-config}
|
||||||
|
#
|
||||||
|
build2_config = $regex.replace_lines( \
|
||||||
|
+ $regex.replace_lines( \
|
||||||
|
$config.save(), \
|
||||||
|
'^ *(#|config\.dist\.|config\.install\.chroot).*$', \
|
||||||
|
[null], \
|
||||||
|
+ return_lines), \
|
||||||
|
+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \
|
||||||
|
+ [null], \
|
||||||
|
return_lines)
|
||||||
|
|
||||||
85
pkgs/development/tools/build-managers/build2/setup-hook.sh
Normal file
85
pkgs/development/tools/build-managers/build2/setup-hook.sh
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
build2ConfigurePhase() {
|
||||||
|
runHook preConfigure
|
||||||
|
|
||||||
|
local flagsArray=(
|
||||||
|
"config.c=$CC"
|
||||||
|
"config.cxx=$CXX"
|
||||||
|
"config.cc.coptions+=-O2"
|
||||||
|
"config.cc.poptions+=-DNDEBUG"
|
||||||
|
"config.install.root=$prefix"
|
||||||
|
"config.install.bin=${!outputBin}/bin"
|
||||||
|
"config.install.doc=${!outputDoc}/share/doc/${shareDocName}"
|
||||||
|
"config.install.exec_root=${!outputBin}"
|
||||||
|
"config.install.include=${!outputInclude}/include"
|
||||||
|
"config.install.lib=${!outputLib}/lib"
|
||||||
|
"config.install.libexec=${!outputLib}/libexec"
|
||||||
|
"config.install.man=${!outputDoc}/share/man"
|
||||||
|
"config.install.sbin=${!outputBin}/sbin"
|
||||||
|
"config.install.bin.mode=755"
|
||||||
|
$build2ConfigureFlags "${build2ConfigureFlagsArray[@]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
echo 'configure flags' "${flagsArray[@]}"
|
||||||
|
|
||||||
|
b configure "${flagsArray[@]}"
|
||||||
|
|
||||||
|
runHook postConfigure
|
||||||
|
}
|
||||||
|
|
||||||
|
build2BuildPhase() {
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
local flagsArray=(
|
||||||
|
$build2BuildFlags "${build2BuildFlagsArray[@]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
echo 'build flags' "${flagsArray[@]}"
|
||||||
|
b "${flagsArray[@]}"
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
}
|
||||||
|
|
||||||
|
build2CheckPhase() {
|
||||||
|
runHook preCheck
|
||||||
|
|
||||||
|
local flagsArray=(
|
||||||
|
$build2CheckFlags "${build2CheckFlags[@]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
echo 'check flags' "${flagsArray[@]}"
|
||||||
|
|
||||||
|
b test ${build2Dir:-.} "${flagsArray[@]}"
|
||||||
|
|
||||||
|
runHook postCheck
|
||||||
|
}
|
||||||
|
|
||||||
|
build2InstallPhase() {
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
local flagsArray=(
|
||||||
|
$build2InstallFlags "${build2InstallFlagsArray[@]}"
|
||||||
|
${installTargets:-}
|
||||||
|
)
|
||||||
|
|
||||||
|
echo 'install flags' "${flagsArray[@]}"
|
||||||
|
b install "${flagsArray[@]}"
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -z "${dontUseBuild2Configure-}" -a -z "${configurePhase-}" ]; then
|
||||||
|
setOutputFlags=
|
||||||
|
configurePhase=build2ConfigurePhase
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${dontUseBuild2Build-}" -a -z "${buildPhase-}" ]; then
|
||||||
|
buildPhase=build2BuildPhase
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${dontUseBuild2Check-}" -a -z "${checkPhase-}" ]; then
|
||||||
|
checkPhase=build2CheckPhase
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "${dontUseBuild2Install-}" -a -z "${installPhase-}" ]; then
|
||||||
|
installPhase=build2InstallPhase
|
||||||
|
fi
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "pgbouncer";
|
pname = "pgbouncer";
|
||||||
version = "1.15.0";
|
version = "1.16.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
|
url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "100ksf2wcdrsscaiq78s030mb48hscjr3kfbm9h6y9d6i8arwnp0";
|
sha256 = "0li66jk1v07bpfmmqzcqjn5vkhglfhwnbncc5bpalg5qidhr38x4";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://pgbouncer.github.io";
|
homepage = "https://pgbouncer.github.io";
|
||||||
description = "Lightweight connection pooler for PostgreSQL";
|
description = "Lightweight connection pooler for PostgreSQL";
|
||||||
license = licenses.isc;
|
license = licenses.isc;
|
||||||
|
maintainers = with maintainers; [ _1000101 ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "pgmetrics";
|
pname = "pgmetrics";
|
||||||
version = "1.11.0";
|
version = "1.12.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rapidloop";
|
owner = "rapidloop";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-8E4rciuoZrj8Oz2EXqtFgrPxvb8GJO3n1s2FpXrR0Q0=";
|
sha256 = "1fwc4qc17fqmzx08kiyfx5iwgzr14dxk9i8zjd9bq5gk281v0ybd";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-scaaRjaDE/RG6Ei83CJBkfQCd1e5pH/Cs2vEbdl9Oyg=";
|
vendorSha256 = "18da45axjl8l3qb6f3w5v2c7clz4bjhdz2bck20j729k7693hpsl";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13979,7 +13979,21 @@ with pkgs;
|
||||||
|
|
||||||
buck = callPackage ../development/tools/build-managers/buck { };
|
buck = callPackage ../development/tools/build-managers/buck { };
|
||||||
|
|
||||||
build2 = callPackage ../development/tools/build-managers/build2 { };
|
build2 = callPackage ../development/tools/build-managers/build2 {
|
||||||
|
# Break cycle by using self-contained toolchain for bootstrapping
|
||||||
|
build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { };
|
||||||
|
};
|
||||||
|
|
||||||
|
# Dependency of build2, must also break cycle for this
|
||||||
|
libbutl = callPackage ../development/libraries/libbutl {
|
||||||
|
build2 = build2.bootstrap;
|
||||||
|
};
|
||||||
|
|
||||||
|
libbpkg = callPackage ../development/libraries/libbpkg { };
|
||||||
|
libodb = callPackage ../development/libraries/libodb { };
|
||||||
|
libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { };
|
||||||
|
bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { };
|
||||||
|
bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { };
|
||||||
|
|
||||||
buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
|
buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
|
||||||
|
|
||||||
|
|
@ -14744,6 +14758,7 @@ with pkgs;
|
||||||
msitools = callPackage ../development/tools/misc/msitools { };
|
msitools = callPackage ../development/tools/misc/msitools { };
|
||||||
|
|
||||||
haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci;
|
haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci;
|
||||||
|
haskell-ci-unstable = lowPrio (haskell.lib.justStaticExecutables haskellPackages.haskell-ci-unstable);
|
||||||
|
|
||||||
neoload = callPackage ../development/tools/neoload {
|
neoload = callPackage ../development/tools/neoload {
|
||||||
licenseAccepted = (config.neoload.accept_license or false);
|
licenseAccepted = (config.neoload.accept_license or false);
|
||||||
|
|
@ -14849,6 +14864,7 @@ with pkgs;
|
||||||
pkg-config = pkgconf-unwrapped;
|
pkg-config = pkgconf-unwrapped;
|
||||||
baseBinName = "pkgconf";
|
baseBinName = "pkgconf";
|
||||||
};
|
};
|
||||||
|
libpkgconf = pkgconf-unwrapped;
|
||||||
|
|
||||||
pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { };
|
pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { };
|
||||||
pkg-config = callPackage ../build-support/pkg-config-wrapper {
|
pkg-config = callPackage ../build-support/pkg-config-wrapper {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue