Merge branch 'staging-next' into staging
This commit is contained in:
commit
7982550ac4
|
@ -24,6 +24,10 @@ Many Erlang/OTP distributions available in `beam.interpreters` have versions wit
|
|||
|
||||
We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `fetchRebar3Deps`.
|
||||
|
||||
We also provide a version on Rebar3 with plugins included, under `rebar3WithPlugins`. This package is a function which takes two arguments: `plugins`, a list of nix derivations to include as plugins (loaded only when specified in `rebar.config`), and `globalPlugins`, which should always be loaded by rebar3. Example: `rebar3WithPlugins { globalPlugins = [beamPackages.pc]; }`.
|
||||
|
||||
When adding a new plugin it is important that the `packageName` attribute is the same as the atom used by rebar3 to refer to the plugin.
|
||||
|
||||
### Mix & Erlang.mk {#build-tools-other}
|
||||
|
||||
Erlang.mk works exactly as expected. There is a bootstrap process that needs to be run, which is supported by the `buildErlangMk` derivation.
|
||||
|
|
|
@ -7429,6 +7429,12 @@
|
|||
githubId = 1538622;
|
||||
name = "Michael Reilly";
|
||||
};
|
||||
onsails = {
|
||||
email = "andrey@onsails.com";
|
||||
github = "onsails";
|
||||
githubId = 107261;
|
||||
name = "Andrey Kuznetsov";
|
||||
};
|
||||
onny = {
|
||||
email = "onny@project-insanity.org";
|
||||
github = "onny";
|
||||
|
|
321
maintainers/scripts/haskell/hydra-report.hs
Executable file
321
maintainers/scripts/haskell/hydra-report.hs
Executable file
|
@ -0,0 +1,321 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
|
||||
#! nix-shell -p hydra-unstable
|
||||
#! nix-shell -i runhaskell
|
||||
|
||||
{-
|
||||
|
||||
The purpose of this script is
|
||||
|
||||
1) download the state of the nixpkgs/haskell-updates job from hydra (with get-report)
|
||||
2) print a summary of the state suitable for pasting into a github comment (with ping-maintainers)
|
||||
3) print a list of broken packages suitable for pasting into configuration-hackage2nix.yaml
|
||||
|
||||
Because step 1) is quite expensive and takes roughly ~5 minutes the result is cached in a json file in XDG_CACHE.
|
||||
|
||||
-}
|
||||
{-# LANGUAGE BlockArguments #-}
|
||||
{-# LANGUAGE DeriveAnyClass #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE DuplicateRecordFields #-}
|
||||
{-# LANGUAGE LambdaCase #-}
|
||||
{-# LANGUAGE MultiWayIf #-}
|
||||
{-# LANGUAGE NamedFieldPuns #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
{-# LANGUAGE TupleSections #-}
|
||||
{-# OPTIONS_GHC -Wall #-}
|
||||
|
||||
import Control.Monad (forM_, (<=<))
|
||||
import Control.Monad.Trans (MonadIO (liftIO))
|
||||
import Data.Aeson (
|
||||
FromJSON,
|
||||
ToJSON,
|
||||
decodeFileStrict',
|
||||
eitherDecodeStrict',
|
||||
encodeFile,
|
||||
)
|
||||
import Data.Foldable (Foldable (toList), foldl')
|
||||
import Data.Function ((&))
|
||||
import Data.Functor ((<&>))
|
||||
import Data.List.NonEmpty (NonEmpty, nonEmpty)
|
||||
import qualified Data.List.NonEmpty as NonEmpty
|
||||
import Data.Map.Strict (Map)
|
||||
import qualified Data.Map.Strict as Map
|
||||
import Data.Maybe (fromMaybe, mapMaybe)
|
||||
import Data.Monoid (Sum (Sum, getSum))
|
||||
import Data.Sequence (Seq)
|
||||
import qualified Data.Sequence as Seq
|
||||
import Data.Set (Set)
|
||||
import qualified Data.Set as Set
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as Text
|
||||
import Data.Text.Encoding (encodeUtf8)
|
||||
import Data.Time (defaultTimeLocale, formatTime, getCurrentTime)
|
||||
import Data.Time.Clock (UTCTime)
|
||||
import GHC.Generics (Generic)
|
||||
import Network.HTTP.Req (
|
||||
GET (GET),
|
||||
NoReqBody (NoReqBody),
|
||||
defaultHttpConfig,
|
||||
header,
|
||||
https,
|
||||
jsonResponse,
|
||||
req,
|
||||
responseBody,
|
||||
responseTimeout,
|
||||
runReq,
|
||||
(/:),
|
||||
)
|
||||
import System.Directory (XdgDirectory (XdgCache), getXdgDirectory)
|
||||
import System.Environment (getArgs)
|
||||
import System.Process (readProcess)
|
||||
import Prelude hiding (id)
|
||||
import qualified Prelude
|
||||
|
||||
newtype JobsetEvals = JobsetEvals
|
||||
{ evals :: Seq Eval
|
||||
}
|
||||
deriving (Generic, ToJSON, FromJSON, Show)
|
||||
|
||||
newtype Nixpkgs = Nixpkgs {revision :: Text}
|
||||
deriving (Generic, ToJSON, FromJSON, Show)
|
||||
|
||||
newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs}
|
||||
deriving (Generic, ToJSON, FromJSON, Show)
|
||||
|
||||
data Eval = Eval
|
||||
{ id :: Int
|
||||
, jobsetevalinputs :: JobsetEvalInputs
|
||||
}
|
||||
deriving (Generic, ToJSON, FromJSON, Show)
|
||||
|
||||
data Build = Build
|
||||
{ job :: Text
|
||||
, buildstatus :: Maybe Int
|
||||
, finished :: Int
|
||||
, id :: Int
|
||||
, nixname :: Text
|
||||
, system :: Text
|
||||
, jobsetevals :: Seq Int
|
||||
}
|
||||
deriving (Generic, ToJSON, FromJSON, Show)
|
||||
|
||||
main :: IO ()
|
||||
main = do
|
||||
args <- getArgs
|
||||
case args of
|
||||
["get-report"] -> getBuildReports
|
||||
["ping-maintainers"] -> printMaintainerPing
|
||||
["mark-broken-list"] -> printMarkBrokenList
|
||||
_ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list"
|
||||
|
||||
reportFileName :: IO FilePath
|
||||
reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
|
||||
|
||||
showT :: Show a => a -> Text
|
||||
showT = Text.pack . show
|
||||
|
||||
getBuildReports :: IO ()
|
||||
getBuildReports = runReq defaultHttpConfig do
|
||||
evalMay <- Seq.lookup 0 . evals <$> myReq (https "hydra.nixos.org" /: "jobset" /: "nixpkgs" /: "haskell-updates" /: "evals") mempty
|
||||
eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay
|
||||
liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..."
|
||||
buildReports :: Seq Build <- myReq (https "hydra.nixos.org" /: "eval" /: showT id /: "builds") (responseTimeout 600000000)
|
||||
liftIO do
|
||||
fileName <- reportFileName
|
||||
putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName
|
||||
now <- getCurrentTime
|
||||
encodeFile fileName (eval, now, buildReports)
|
||||
where
|
||||
myReq query option = responseBody <$> req GET query NoReqBody jsonResponse (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option)
|
||||
|
||||
hydraEvalCommand :: FilePath
|
||||
hydraEvalCommand = "hydra-eval-jobs"
|
||||
hydraEvalParams :: [String]
|
||||
hydraEvalParams = ["-I", ".", "pkgs/top-level/release-haskell.nix"]
|
||||
handlesCommand :: FilePath
|
||||
handlesCommand = "nix-instantiate"
|
||||
handlesParams :: [String]
|
||||
handlesParams = ["--eval", "--strict", "--json", "-"]
|
||||
handlesExpression :: String
|
||||
handlesExpression = "with import ./. {}; with lib; zipAttrsWith (_: builtins.head) (mapAttrsToList (_: v: if v ? github then { \"${v.email}\" = v.github; } else {}) (import maintainers/maintainer-list.nix))"
|
||||
|
||||
newtype Maintainers = Maintainers {maintainers :: Maybe Text} deriving (Generic, ToJSON, FromJSON)
|
||||
|
||||
type HydraJobs = Map Text Maintainers
|
||||
type MaintainerMap = Map Text (NonEmpty Text)
|
||||
|
||||
getMaintainerMap :: IO MaintainerMap
|
||||
getMaintainerMap = do
|
||||
hydraJobs :: HydraJobs <- get hydraEvalCommand hydraEvalParams "" "Failed to decode hydra-eval-jobs output: "
|
||||
handlesMap :: Map Text Text <- get handlesCommand handlesParams handlesExpression "Failed to decode nix output for lookup of github handles: "
|
||||
pure $ hydraJobs & Map.mapMaybe (nonEmpty . mapMaybe (`Map.lookup` handlesMap) . Text.splitOn ", " . fromMaybe "" . maintainers)
|
||||
where
|
||||
get c p i e = readProcess c p i <&> \x -> either (error . (<> " Raw:'" <> take 1000 x <> "'") . (e <>)) Prelude.id . eitherDecodeStrict' . encodeUtf8 . Text.pack $ x
|
||||
|
||||
-- BuildStates are sorted by subjective importance/concerningness
|
||||
data BuildState = Failed | DependencyFailed | OutputLimitExceeded | Unknown (Maybe Int) | TimedOut | Canceled | Unfinished | Success deriving (Show, Eq, Ord)
|
||||
|
||||
icon :: BuildState -> Text
|
||||
icon = \case
|
||||
Failed -> ":x:"
|
||||
DependencyFailed -> ":heavy_exclamation_mark:"
|
||||
OutputLimitExceeded -> ":warning:"
|
||||
Unknown x -> "unknown code " <> showT x
|
||||
TimedOut -> ":hourglass::no_entry_sign:"
|
||||
Canceled -> ":no_entry_sign:"
|
||||
Unfinished -> ":hourglass_flowing_sand:"
|
||||
Success -> ":heavy_check_mark:"
|
||||
|
||||
platformIcon :: Platform -> Text
|
||||
platformIcon (Platform x) = case x of
|
||||
"x86_64-linux" -> ":penguin:"
|
||||
"aarch64-linux" -> ":iphone:"
|
||||
"x86_64-darwin" -> ":apple:"
|
||||
_ -> x
|
||||
|
||||
data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord)
|
||||
newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord)
|
||||
newtype Table row col a = Table (Map (row, col) a)
|
||||
type StatusSummary = Map Text (Table Text Platform BuildResult, Set Text)
|
||||
|
||||
instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where
|
||||
Table l <> Table r = Table (Map.unionWith (<>) l r)
|
||||
instance (Ord row, Ord col, Semigroup a) => Monoid (Table row col a) where
|
||||
mempty = Table Map.empty
|
||||
instance Functor (Table row col) where
|
||||
fmap f (Table a) = Table (fmap f a)
|
||||
instance Foldable (Table row col) where
|
||||
foldMap f (Table a) = foldMap f a
|
||||
|
||||
buildSummary :: MaintainerMap -> Seq Build -> StatusSummary
|
||||
buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary
|
||||
where
|
||||
unionSummary (Table l, l') (Table r, r') = (Table $ Map.union l r, l' <> r')
|
||||
toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (Table (Map.singleton (set, Platform system) (BuildResult state id)), maintainers)
|
||||
where
|
||||
state :: BuildState
|
||||
state = case (finished, buildstatus) of
|
||||
(0, _) -> Unfinished
|
||||
(_, Just 0) -> Success
|
||||
(_, Just 4) -> Canceled
|
||||
(_, Just 7) -> TimedOut
|
||||
(_, Just 2) -> DependencyFailed
|
||||
(_, Just 1) -> Failed
|
||||
(_, Just 11) -> OutputLimitExceeded
|
||||
(_, i) -> Unknown i
|
||||
packageName = fromMaybe job (Text.stripSuffix ("." <> system) job)
|
||||
splitted = nonEmpty $ Text.splitOn "." packageName
|
||||
name = maybe packageName NonEmpty.last splitted
|
||||
set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted
|
||||
maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap)
|
||||
|
||||
readBuildReports :: IO (Eval, UTCTime, Seq Build)
|
||||
readBuildReports = do
|
||||
file <- reportFileName
|
||||
fromMaybe (error $ "Could not decode " <> file) <$> decodeFileStrict' file
|
||||
|
||||
sep :: Text
|
||||
sep = " | "
|
||||
joinTable :: [Text] -> Text
|
||||
joinTable t = sep <> Text.intercalate sep t <> sep
|
||||
|
||||
type NumSummary = Table Platform BuildState Int
|
||||
|
||||
printTable :: (Ord rows, Ord cols) => Text -> (rows -> Text) -> (cols -> Text) -> (entries -> Text) -> Table rows cols entries -> [Text]
|
||||
printTable name showR showC showE (Table mapping) = joinTable <$> (name : map showC cols) : replicate (length cols + sepsInName + 1) "---" : map printRow rows
|
||||
where
|
||||
sepsInName = Text.count "|" name
|
||||
printRow row = showR row : map (\col -> maybe "" showE (Map.lookup (row, col) mapping)) cols
|
||||
rows = toList $ Set.fromList (fst <$> Map.keys mapping)
|
||||
cols = toList $ Set.fromList (snd <$> Map.keys mapping)
|
||||
|
||||
printJob :: Int -> Text -> (Table Text Platform BuildResult, Text) -> [Text]
|
||||
printJob evalId name (Table mapping, maintainers) =
|
||||
if length sets <= 1
|
||||
then map printSingleRow sets
|
||||
else ["- [ ] " <> makeJobSearchLink "" name <> " " <> maintainers] <> map printRow sets
|
||||
where
|
||||
printRow set = " - " <> printState set <> " " <> makeJobSearchLink set (if Text.null set then "toplevel" else set)
|
||||
printSingleRow set = "- [ ] " <> printState set <> " " <> makeJobSearchLink set (makePkgName set) <> " " <> maintainers
|
||||
makePkgName set = (if Text.null set then "" else set <> ".") <> name
|
||||
printState set = Text.intercalate " " $ map (\pf -> maybe "" (label pf) $ Map.lookup (set, pf) mapping) platforms
|
||||
makeJobSearchLink set linkLabel= makeSearchLink evalId linkLabel (makePkgName set <> ".") -- Append '.' to the search query to prevent e.g. "hspec." matching "hspec-golden.x86_64-linux"
|
||||
sets = toList $ Set.fromList (fst <$> Map.keys mapping)
|
||||
platforms = toList $ Set.fromList (snd <$> Map.keys mapping)
|
||||
label pf (BuildResult s i) = "[[" <> platformIcon pf <> icon s <> "]](https://hydra.nixos.org/build/" <> showT i <> ")"
|
||||
|
||||
makeSearchLink :: Int -> Text -> Text -> Text
|
||||
makeSearchLink evalId linkLabel query = "[" <> linkLabel <> "](" <> "https://hydra.nixos.org/eval/" <> showT evalId <> "?filter=" <> query <> ")"
|
||||
|
||||
statusToNumSummary :: StatusSummary -> NumSummary
|
||||
statusToNumSummary = fmap getSum . foldMap (fmap Sum . jobTotals)
|
||||
|
||||
jobTotals :: (Table Text Platform BuildResult, a) -> Table Platform BuildState Int
|
||||
jobTotals (Table mapping, _) = getSum <$> Table (Map.foldMapWithKey (\(_, platform) (BuildResult buildstate _) -> Map.singleton (platform, buildstate) (Sum 1)) mapping)
|
||||
|
||||
details :: Text -> [Text] -> [Text]
|
||||
details summary content = ["<details><summary>" <> summary <> " </summary>", ""] <> content <> ["</details>", ""]
|
||||
|
||||
printBuildSummary :: Eval -> UTCTime -> StatusSummary -> Text
|
||||
printBuildSummary
|
||||
Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}}
|
||||
fetchTime
|
||||
summary =
|
||||
Text.unlines $
|
||||
headline <> totals
|
||||
<> optionalList "#### Maintained packages with build failure" (maintainedList fails)
|
||||
<> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps)
|
||||
<> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr)
|
||||
<> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails)
|
||||
<> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps)
|
||||
<> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr)
|
||||
<> footer
|
||||
where
|
||||
footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.sh)*"]
|
||||
totals =
|
||||
[ "#### Build summary"
|
||||
, ""
|
||||
]
|
||||
<> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT (statusToNumSummary summary)
|
||||
headline =
|
||||
[ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)"
|
||||
, "*evaluation ["
|
||||
<> showT id
|
||||
<> "](https://hydra.nixos.org/eval/"
|
||||
<> showT id
|
||||
<> ") of nixpkgs commit ["
|
||||
<> Text.take 7 revision
|
||||
<> "](https://github.com/NixOS/nixpkgs/commits/"
|
||||
<> revision
|
||||
<> ") as of "
|
||||
<> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime)
|
||||
<> "*"
|
||||
]
|
||||
jobsByState predicate = Map.filter (predicate . foldl' min Success . fmap state . fst) summary
|
||||
fails = jobsByState (== Failed)
|
||||
failedDeps = jobsByState (== DependencyFailed)
|
||||
unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut)
|
||||
withMaintainer = Map.mapMaybe (\(x, m) -> (x,) <$> nonEmpty (Set.toList m))
|
||||
withoutMaintainer = Map.mapMaybe (\(x, m) -> if Set.null m then Just x else Nothing)
|
||||
optionalList heading list = if null list then mempty else [heading] <> list
|
||||
optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list
|
||||
maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer
|
||||
unmaintainedList = showBuild <=< Map.toList . withoutMaintainer
|
||||
showBuild (name, table) = printJob id name (table, "")
|
||||
showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers)))
|
||||
|
||||
printMaintainerPing :: IO ()
|
||||
printMaintainerPing = do
|
||||
maintainerMap <- getMaintainerMap
|
||||
(eval, fetchTime, buildReport) <- readBuildReports
|
||||
putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap buildReport)))
|
||||
|
||||
printMarkBrokenList :: IO ()
|
||||
printMarkBrokenList = do
|
||||
(_, _, buildReport) <- readBuildReports
|
||||
forM_ buildReport \Build{buildstatus, job} ->
|
||||
case (buildstatus, Text.splitOn "." job) of
|
||||
(Just 1, ["haskellPackages", name, "x86_64-linux"]) -> putStrLn $ " - " <> Text.unpack name
|
||||
_ -> pure ()
|
45
maintainers/scripts/haskell/mark-broken.sh
Executable file
45
maintainers/scripts/haskell/mark-broken.sh
Executable file
|
@ -0,0 +1,45 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils git -I nixpkgs=.
|
||||
|
||||
# This script uses the data pulled with
|
||||
# maintainers/scripts/haskell/hydra-report.hs get-report to produce a list of
|
||||
# failing builds that get written to the hackage2nix config. Then
|
||||
# hackage-packages.nix gets regenerated and transitive-broken packages get
|
||||
# marked as dont-distribute in the config as well.
|
||||
# This should disable builds for most failing jobs in the haskell-updates jobset.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
broken_config="pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml"
|
||||
|
||||
tmpfile=$(mktemp)
|
||||
trap "rm ${tmpfile}" 0
|
||||
|
||||
echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script."
|
||||
echo "Generating a list of broken builds and displaying for manual confirmation ..."
|
||||
maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile
|
||||
|
||||
$EDITOR $tmpfile
|
||||
|
||||
tail -n +3 "$broken_config" >> "$tmpfile"
|
||||
|
||||
cat > "$broken_config" << EOF
|
||||
broken-packages:
|
||||
# These packages don't compile.
|
||||
EOF
|
||||
|
||||
sort -iu "$tmpfile" >> "$broken_config"
|
||||
maintainers/scripts/haskell/regenerate-hackage-packages.sh
|
||||
maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
|
||||
maintainers/scripts/haskell/regenerate-hackage-packages.sh
|
||||
|
||||
if [[ "${1:-}" == "--do-commit" ]]; then
|
||||
git add $broken_config
|
||||
git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
|
||||
git add pkgs/development/haskell-modules/hackage-packages.nix
|
||||
git commit -F - << EOF
|
||||
hackage2nix: Mark failing builds broken
|
||||
|
||||
This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
|
||||
EOF
|
||||
fi
|
|
@ -1,3 +1,15 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p coreutils nix gnused -I nixpkgs=.
|
||||
echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' > pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
|
||||
|
||||
config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
|
||||
|
||||
cat > $config_file << EOF
|
||||
# This file is automatically generated by
|
||||
# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
|
||||
# It is supposed to list all haskellPackages that cannot evaluate because they
|
||||
# depend on a dependency marked as broken.
|
||||
dont-distribute-packages:
|
||||
EOF
|
||||
|
||||
echo "Regenerating list of transitive broken packages ..."
|
||||
echo -e $(nix-instantiate --eval --strict maintainers/scripts/haskell/transitive-broken-packages.nix) | sed 's/\"//' | sort -i >> $config_file
|
||||
|
|
|
@ -12,10 +12,5 @@ let
|
|||
(getEvaluating (nixpkgs { config.allowBroken = true; }).haskellPackages);
|
||||
in
|
||||
''
|
||||
# This file is automatically generated by
|
||||
# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
|
||||
# It is supposed to list all haskellPackages that cannot evaluate because they
|
||||
# depend on a dependency marked as broken.
|
||||
dont-distribute-packages:
|
||||
${lib.concatMapStringsSep "\n" (x: " - ${x}") brokenDeps}
|
||||
''
|
||||
|
|
|
@ -233,7 +233,10 @@ let
|
|||
# Notes about grub:
|
||||
# * Yes, the grubMenuCfg has to be repeated in all submenus. Otherwise you
|
||||
# will get white-on-black console-like text on sub-menus. *sigh*
|
||||
efiDir = pkgs.runCommand "efi-directory" {} ''
|
||||
efiDir = pkgs.runCommand "efi-directory" {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.grub2_efi ];
|
||||
strictDeps = true;
|
||||
} ''
|
||||
mkdir -p $out/EFI/boot/
|
||||
|
||||
# ALWAYS required modules.
|
||||
|
@ -263,7 +266,7 @@ let
|
|||
|
||||
# Make our own efi program, we can't rely on "grub-install" since it seems to
|
||||
# probe for devices, even with --skip-fs-probe.
|
||||
${grubPkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \
|
||||
grub-mkimage --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \
|
||||
$MODULES
|
||||
cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
|
||||
|
||||
|
@ -388,7 +391,10 @@ let
|
|||
${refind}
|
||||
'';
|
||||
|
||||
efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; }
|
||||
efiImg = pkgs.runCommand "efi-image_eltorito" {
|
||||
nativeBuildInputs = [ pkgs.buildPackages.mtools pkgs.buildPackages.libfaketime pkgs.buildPackages.dosfstools ];
|
||||
strictDeps = true;
|
||||
}
|
||||
# Be careful about determinism: du --apparent-size,
|
||||
# dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i)
|
||||
''
|
||||
|
@ -408,10 +414,10 @@ let
|
|||
echo "Usage size: $usage_size"
|
||||
echo "Image size: $image_size"
|
||||
truncate --size=$image_size "$out"
|
||||
${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
|
||||
faketime "2000-01-01 00:00:00" mkfs.vfat -i 12345678 -n EFIBOOT "$out"
|
||||
mcopy -psvm -i "$out" ./EFI ./boot ::
|
||||
# Verify the FAT partition.
|
||||
${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
|
||||
fsck.vfat -vn "$out"
|
||||
''; # */
|
||||
|
||||
# Name used by UEFI for architectures.
|
||||
|
@ -420,6 +426,8 @@ let
|
|||
"ia32"
|
||||
else if pkgs.stdenv.isx86_64 then
|
||||
"x64"
|
||||
else if pkgs.stdenv.isAarch32 then
|
||||
"arm"
|
||||
else if pkgs.stdenv.isAarch64 then
|
||||
"aa64"
|
||||
else
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../sd-card/sd-image-raspberrypi4-installer.nix
|
||||
];
|
||||
config = {
|
||||
warnings = [
|
||||
''
|
||||
.../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed.
|
||||
Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
imports = [
|
||||
../../profiles/installation-device.nix
|
||||
./sd-image-raspberrypi4.nix
|
||||
];
|
||||
|
||||
# the installation media is also the installation target,
|
||||
# so we don't want to provide the installation configuration.nix.
|
||||
installer.cloneConfig = false;
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
# To build, use:
|
||||
# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix -A config.system.build.sdImage
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./sd-image-aarch64.nix ];
|
||||
boot.kernelPackages = pkgs.linuxPackages_rpi4;
|
||||
}
|
|
@ -471,6 +471,7 @@
|
|||
./services/misc/cgminer.nix
|
||||
./services/misc/confd.nix
|
||||
./services/misc/couchpotato.nix
|
||||
./services/misc/dendrite.nix
|
||||
./services/misc/devmon.nix
|
||||
./services/misc/dictd.nix
|
||||
./services/misc/duckling.nix
|
||||
|
@ -513,7 +514,6 @@
|
|||
./services/misc/mame.nix
|
||||
./services/misc/matrix-appservice-discord.nix
|
||||
./services/misc/matrix-appservice-irc.nix
|
||||
./services/misc/matrix-dendrite.nix
|
||||
./services/misc/matrix-synapse.nix
|
||||
./services/misc/mautrix-telegram.nix
|
||||
./services/misc/mbpfan.nix
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.matrix-dendrite;
|
||||
cfg = config.services.dendrite;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
configurationYaml = settingsFormat.generate "dendrite.yaml" cfg.settings;
|
||||
workingDir = "/var/lib/matrix-dendrite";
|
||||
workingDir = "/var/lib/dendrite";
|
||||
in
|
||||
{
|
||||
options.services.matrix-dendrite = {
|
||||
options.services.dendrite = {
|
||||
enable = lib.mkEnableOption "matrix.org dendrite";
|
||||
httpPort = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.port;
|
||||
|
@ -24,31 +24,31 @@ in
|
|||
};
|
||||
tlsCert = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = "/var/lib/matrix-dendrite/server.cert";
|
||||
example = "/var/lib/dendrite/server.cert";
|
||||
default = null;
|
||||
description = ''
|
||||
The path to the TLS certificate.
|
||||
|
||||
<programlisting>
|
||||
nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
tlsKey = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = "/var/lib/matrix-dendrite/server.key";
|
||||
example = "/var/lib/dendrite/server.key";
|
||||
default = null;
|
||||
description = ''
|
||||
The path to the TLS key.
|
||||
|
||||
<programlisting>
|
||||
nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
environmentFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = "/var/lib/matrix-dendrite/registration_secret";
|
||||
example = "/var/lib/dendrite/registration_secret";
|
||||
default = null;
|
||||
description = ''
|
||||
Environment file as defined in <citerefentry>
|
||||
|
@ -62,7 +62,7 @@ in
|
|||
|
||||
<programlisting>
|
||||
# snippet of dendrite-related config
|
||||
services.matrix-dendrite.settings.client_api.registration_shared_secret = "$REGISTRATION_SHARED_SECRET";
|
||||
services.dendrite.settings.client_api.registration_shared_secret = "$REGISTRATION_SHARED_SECRET";
|
||||
</programlisting>
|
||||
|
||||
<programlisting>
|
||||
|
@ -95,7 +95,7 @@ in
|
|||
requests and events.
|
||||
|
||||
<programlisting>
|
||||
nix-shell -p matrix-dendrite --command "generate-keys --private-key matrix_key.pem"
|
||||
nix-shell -p dendrite --command "generate-keys --private-key matrix_key.pem"
|
||||
</programlisting>
|
||||
'';
|
||||
};
|
||||
|
@ -136,11 +136,11 @@ in
|
|||
message = ''
|
||||
If Dendrite is configured to use https, tlsCert and tlsKey must be provided.
|
||||
|
||||
nix-shell -p matrix-dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
nix-shell -p dendrite --command "generate-keys --tls-cert server.crt --tls-key server.key"
|
||||
'';
|
||||
}];
|
||||
|
||||
systemd.services.matrix-dendrite = {
|
||||
systemd.services.dendrite = {
|
||||
description = "Dendrite Matrix homeserver";
|
||||
after = [
|
||||
"network.target"
|
||||
|
@ -149,22 +149,22 @@ in
|
|||
serviceConfig = {
|
||||
Type = "simple";
|
||||
DynamicUser = true;
|
||||
StateDirectory = "matrix-dendrite";
|
||||
StateDirectory = "dendrite";
|
||||
WorkingDirectory = workingDir;
|
||||
RuntimeDirectory = "matrix-dendrite";
|
||||
RuntimeDirectory = "dendrite";
|
||||
RuntimeDirectoryMode = "0700";
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
ExecStartPre =
|
||||
if (cfg.environmentFile != null) then ''
|
||||
${pkgs.envsubst}/bin/envsubst \
|
||||
-i ${configurationYaml} \
|
||||
-o /run/matrix-dendrite/dendrite.yaml
|
||||
-o /run/dendrite/dendrite.yaml
|
||||
'' else ''
|
||||
${pkgs.coreutils}/bin/cp ${configurationYaml} /run/matrix-dendrite/dendrite.yaml
|
||||
${pkgs.coreutils}/bin/cp ${configurationYaml} /run/dendrite/dendrite.yaml
|
||||
'';
|
||||
ExecStart = lib.strings.concatStringsSep " " ([
|
||||
"${pkgs.matrix-dendrite}/bin/dendrite-monolith-server"
|
||||
"--config /run/matrix-dendrite/dendrite.yaml"
|
||||
"${pkgs.dendrite}/bin/dendrite-monolith-server"
|
||||
"--config /run/dendrite/dendrite.yaml"
|
||||
] ++ lib.optionals (cfg.httpPort != null) [
|
||||
"--http-bind-address :${builtins.toString cfg.httpPort}"
|
||||
] ++ lib.optionals (cfg.httpsPort != null) [
|
|
@ -22,8 +22,8 @@ in {
|
|||
package = mkOption {
|
||||
type = types.path;
|
||||
description = "The SSM agent package to use";
|
||||
default = pkgs.ssm-agent;
|
||||
defaultText = "pkgs.ssm-agent";
|
||||
default = pkgs.ssm-agent.override { overrideEtc = false; };
|
||||
defaultText = "pkgs.ssm-agent.override { overrideEtc = false; }";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -37,8 +37,10 @@ in {
|
|||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/amazon-ssm-agent";
|
||||
KillMode = "process";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "15min";
|
||||
# We want this restating pretty frequently. It could be our only means
|
||||
# of accessing the instance.
|
||||
Restart = "always";
|
||||
RestartSec = "1min";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -62,5 +64,10 @@ in {
|
|||
isNormalUser = true;
|
||||
group = "ssm-user";
|
||||
};
|
||||
|
||||
environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/seelog.xml.template";
|
||||
|
||||
environment.etc."amazon/ssm/amazon-ssm-agent.json".source = "${cfg.package}/etc/amazon/ssm/amazon-ssm-agent.json.template";
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,6 +8,7 @@ let
|
|||
wrappedPlugins = pkgs.runCommand "wrapped-plugins" { preferLocalBuild = true; } ''
|
||||
mkdir -p $out/libexec/netdata/plugins.d
|
||||
ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
|
||||
ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network
|
||||
ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
|
||||
ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
|
||||
ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
|
||||
|
@ -26,6 +27,10 @@ let
|
|||
"web files owner" = "root";
|
||||
"web files group" = "root";
|
||||
};
|
||||
"plugin:cgroups" = {
|
||||
"script to get cgroup network interfaces" = "${wrappedPlugins}/libexec/netdata/plugins.d/cgroup-network";
|
||||
"use unified cgroups" = "yes";
|
||||
};
|
||||
};
|
||||
mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config);
|
||||
configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig);
|
||||
|
@ -183,9 +188,6 @@ in {
|
|||
ConfigurationDirectory = "netdata";
|
||||
ConfigurationDirectoryMode = "0755";
|
||||
# Capabilities
|
||||
AmbientCapabilities = [
|
||||
"CAP_SETUID" # is required for cgroups and cgroups-network plugins
|
||||
];
|
||||
CapabilityBoundingSet = [
|
||||
"CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins
|
||||
"CAP_DAC_READ_SEARCH" # is required for apps plugin
|
||||
|
@ -214,7 +216,15 @@ in {
|
|||
capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+rx,o-rwx";
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
security.wrappers."cgroup-network" = {
|
||||
source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
|
||||
capabilities = "cap_setuid+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
security.wrappers."freeipmi.plugin" = {
|
||||
|
@ -222,7 +232,7 @@ in {
|
|||
capabilities = "cap_dac_override,cap_fowner+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+rx,o-rwx";
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
security.wrappers."perf.plugin" = {
|
||||
|
@ -230,7 +240,7 @@ in {
|
|||
capabilities = "cap_sys_admin+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+rx,o-rx";
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
security.wrappers."slabinfo.plugin" = {
|
||||
|
@ -238,7 +248,7 @@ in {
|
|||
capabilities = "cap_dac_override+ep";
|
||||
owner = cfg.user;
|
||||
group = cfg.group;
|
||||
permissions = "u+rx,g+rx,o-rx";
|
||||
permissions = "u+rx,g+x,o-rwx";
|
||||
};
|
||||
|
||||
security.pam.loginLimits = [
|
||||
|
|
|
@ -32,7 +32,7 @@ let
|
|||
slaves = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = "Addresses who may request zone transfers.";
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
|
@ -105,7 +105,7 @@ in
|
|||
enable = mkEnableOption "BIND domain name server";
|
||||
|
||||
cacheNetworks = mkOption {
|
||||
default = ["127.0.0.0/24"];
|
||||
default = [ "127.0.0.0/24" ];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
What networks are allowed to use us as a resolver. Note
|
||||
|
@ -117,7 +117,7 @@ in
|
|||
};
|
||||
|
||||
blockedNetworks = mkOption {
|
||||
default = [];
|
||||
default = [ ];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
What networks are just blocked.
|
||||
|
@ -141,7 +141,7 @@ in
|
|||
};
|
||||
|
||||
listenOn = mkOption {
|
||||
default = ["any"];
|
||||
default = [ "any" ];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
Interfaces to listen on.
|
||||
|
@ -149,7 +149,7 @@ in
|
|||
};
|
||||
|
||||
listenOnIpv6 = mkOption {
|
||||
default = ["any"];
|
||||
default = [ "any" ];
|
||||
type = types.listOf types.str;
|
||||
description = "
|
||||
Ipv6 interfaces to listen on.
|
||||
|
@ -157,7 +157,7 @@ in
|
|||
};
|
||||
|
||||
zones = mkOption {
|
||||
default = [];
|
||||
default = [ ];
|
||||
type = with types; coercedTo (listOf attrs) bindZoneCoerce (attrsOf (types.submodule bindZoneOptions));
|
||||
description = "
|
||||
List of zones we claim authority over.
|
||||
|
@ -166,8 +166,8 @@ in
|
|||
"example.com" = {
|
||||
master = false;
|
||||
file = "/var/dns/example.com";
|
||||
masters = ["192.168.0.1"];
|
||||
slaves = [];
|
||||
masters = [ "192.168.0.1" ];
|
||||
slaves = [ ];
|
||||
extraConfig = "";
|
||||
};
|
||||
};
|
||||
|
@ -212,7 +212,8 @@ in
|
|||
networking.resolvconf.useLocalResolver = mkDefault true;
|
||||
|
||||
users.users.${bindUser} =
|
||||
{ uid = config.ids.uids.bind;
|
||||
{
|
||||
uid = config.ids.uids.bind;
|
||||
description = "BIND daemon user";
|
||||
};
|
||||
|
||||
|
@ -232,9 +233,9 @@ in
|
|||
'';
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
|
||||
ExecStart = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
|
||||
ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
|
||||
ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
|
||||
ExecStop = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
|
||||
};
|
||||
|
||||
unitConfig.Documentation = "man:named(8)";
|
||||
|
|
|
@ -186,11 +186,6 @@ in rec {
|
|||
inherit system;
|
||||
});
|
||||
|
||||
sd_image_raspberrypi4 = forMatchingSystems [ "aarch64-linux" ] (system: makeSdImage {
|
||||
module = ./modules/installer/sd-card/sd-image-raspberrypi4-installer.nix;
|
||||
inherit system;
|
||||
});
|
||||
|
||||
# A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
|
||||
ova = forMatchingSystems [ "x86_64-linux" ] (system:
|
||||
|
||||
|
|
|
@ -34,13 +34,13 @@ self: super: {
|
|||
|
||||
kak-ansi = stdenv.mkDerivation rec {
|
||||
pname = "kak-ansi";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eraserhd";
|
||||
repo = "kak-ansi";
|
||||
rev = "v${version}";
|
||||
sha256 = "pO7M3MjKMJQew9O20KALEvsXLuCKPYGGTtuN/q/kj8Q=";
|
||||
sha256 = "kFjTYFy0KF5WWEHU4hHFAnD/03/d3ptjqMMbTSaGImE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "08151qdhf4chg9gfbs0dl0v0k5vla2gz5dfy439jzdg1d022d5rw";
|
||||
x86_64-darwin = "1vlxxkv3wvds3xl3ir93l5q5yq2d7mcragsicfayj9x9r49ilqn3";
|
||||
aarch64-linux = "0rxw1wsi555z41ak817sxqyyan0rm7hma640zsh8dz0yvhzdv1h8";
|
||||
armv7l-linux = "1ijvd7r2fxxlw4zv3zx5h70b3d0b4gcq3aljsi02v1lr2zm8f8gb";
|
||||
x86_64-linux = "0v1g7j5q2j86c3r7jib8xs1sf2h3xvwv1s0xsqbig480fchlshjg";
|
||||
x86_64-darwin = "109529acrvyassq00mbhnwbxq7rfq9n69rgcw4n0rysgp8n58386";
|
||||
aarch64-linux = "0p6pz9apbfmr4pf7fikp2rmvk5gr87md1zrhr6hhd1qwgpc9kl07";
|
||||
armv7l-linux = "1qrp75nbzgqp7mv42m6wbj000l33rhfv7cnxdv6lp6cy05381aq6";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.55.2";
|
||||
version = "1.56.0";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
|
|
@ -13,10 +13,10 @@ let
|
|||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "12mdila9gspj6b9s6488j0ba264vm4a46546kplma7s6gkkpz4zx";
|
||||
x86_64-darwin = "15wdznihc2ra2fjy9p4j898vazjr4h5yighaxh7jk9kcvarg1658";
|
||||
aarch64-linux = "0plw1an1z3v333irbc53skrmq2klas21srriiqkvmkgkfvpx1rq2";
|
||||
armv7l-linux = "1ys82pa18qshpinaqqrskxvljzap20xwj5ncffn031yacg1y2qx2";
|
||||
x86_64-linux = "01bg6bjjbbdywd7r13safa5nxx1y9a8zia7q6z5anc60hfylvhd2";
|
||||
x86_64-darwin = "0xkzxlp45f9vl9yrrk8fynwpsv85yjmsp6ylm2fbmfddf9bqkjsb";
|
||||
aarch64-linux = "028g359jrbs1hbxwq4gqq1s08vv38i3x52vjalqrpc6b0wc5cc2w";
|
||||
armv7l-linux = "06w5h7q799b9kwagi6w3320yjdp66cwr6d0dd7sl4sirqnrap0i4";
|
||||
}.${system};
|
||||
|
||||
sourceRoot = {
|
||||
|
@ -33,7 +33,7 @@ in
|
|||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.55.2";
|
||||
version = "1.56.0";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
|
|
@ -10,11 +10,11 @@ with lib;
|
|||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "gscan2pdf";
|
||||
version = "2.11.1";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0aigngfi5dbjihn43c6sg865i1ybfzj0w81zclzy8r9nqiqq0wma";
|
||||
sha256 = "0x20wpqqw6534rn73660zdfy4c3jpg2n31py566k0x2nd6g0mhg5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
|
@ -112,6 +112,12 @@ perlPackages.buildPerlPackage rec {
|
|||
# t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100)
|
||||
rm t/169_import_scan.t
|
||||
|
||||
# Disable a test which passes but reports an incorrect status
|
||||
# t/0601_Dialog_Scan.t .......................... All 14 subtests passed
|
||||
# t/0601_Dialog_Scan.t (Wstat: 139 Tests: 14 Failed: 0)
|
||||
# Non-zero wait status: 139
|
||||
rm t/0601_Dialog_Scan.t
|
||||
|
||||
xvfb-run -s '-screen 0 800x600x24' \
|
||||
make test
|
||||
'';
|
||||
|
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "calibre";
|
||||
version = "5.16.1";
|
||||
version = "5.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-lTXCW0MGNOezecaGO9c2JGU4ylwpPmBaMXTY3nLNcrE=";
|
||||
hash = "sha256-rdiBL3Y3q/0wFfWGE4jGkWakgV8hA9HjDcKXso6tVrs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -114,7 +114,6 @@ mkDerivation rec {
|
|||
export FC_LIB_DIR=${fontconfig.lib}/lib
|
||||
export PODOFO_INC_DIR=${podofo.dev}/include/podofo
|
||||
export PODOFO_LIB_DIR=${podofo.lib}/lib
|
||||
export SIP_BIN=${python3Packages.sip}/bin/sip
|
||||
export XDG_DATA_HOME=$out/share
|
||||
export XDG_UTILS_INSTALL_MODE="user"
|
||||
|
||||
|
|
|
@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec {
|
|||
license = licenses.mit;
|
||||
platforms = platforms.linux; # It's meant for river, a wayland compositor
|
||||
maintainers = with maintainers; [ fortuneteller2k ];
|
||||
mainProgram = "kile";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kratos";
|
||||
version = "0.6.0-alpha.1";
|
||||
version = "0.6.0-alpha.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ory";
|
||||
repo = "kratos";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lnrm7ma203b5a0vxgm9zqsbs3nigx0kng5zymrjvrzll1gd79wm";
|
||||
sha256 = "0zg6afzqi5fmr7hmy1cd7fknd1bcplz3h0f7z67l75v8k2n73md1";
|
||||
};
|
||||
|
||||
vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw";
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mediaelch";
|
||||
version = "2.8.8";
|
||||
version = "2.8.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Komet";
|
||||
repo = "MediaElch";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yif0ibmlj0bhl7fnhg9yclxg2iyjygmjhffinp5kgqy0vaabkzw";
|
||||
sha256 = "1gx4m9cf81d0b2nk2rlqm4misz67f5bpkjqx7d1l76rw2pwc6azf";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moonlight-embedded";
|
||||
version = "2.4.10";
|
||||
version = "2.4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irtimmer";
|
||||
repo = "moonlight-embedded";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m5i3q3hbjl51cndjpz5hxi3br6fvpn1fzdv0f6lxjxgw9z32413";
|
||||
sha256 = "19wm4gizj8q6j4jwqfcn3bkhms97d8afwxmqjmjnqqxzpd2gxc16";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, tmux, which, makeWrapper }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "overmind";
|
||||
version = "2.2.0";
|
||||
goPackagePath = "github.com/DarthSim/overmind";
|
||||
version = "2.2.2";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
@ -15,10 +14,10 @@ buildGoPackage rec {
|
|||
owner = "DarthSim";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "00v6l4138vv32bqfkzrhk4hfl52a00rlg9ywhp4difgrnz7zj6xb";
|
||||
sha256 = "zDjIwnhDoUj+zTAhtBa94dx7QhYMCTxv2DNUpeP8CP0=";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
vendorSha256 = "KDMzR6qAruscgS6/bHTN6RnHOlLKCm9lxkr9k3oLY+Y=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/DarthSim/overmind";
|
||||
|
|
129
pkgs/applications/misc/overmind/deps.nix
generated
129
pkgs/applications/misc/overmind/deps.nix
generated
|
@ -1,129 +0,0 @@
|
|||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/BurntSushi/toml";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/BurntSushi/toml";
|
||||
rev = "v0.3.1";
|
||||
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/DarthSim/godotenv";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/DarthSim/godotenv";
|
||||
rev = "v1.3.1";
|
||||
sha256 = "0fb9nl5qrnv7f9w0pgg00ak34afw9kjgcql0l38z22faz2bhgl1q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/cpuguy83/go-md2man";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/cpuguy83/go-md2man";
|
||||
rev = "f79a8a8ca69d";
|
||||
sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kardianos/osext";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kardianos/osext";
|
||||
rev = "2bc1f35cddc0";
|
||||
sha256 = "1pvrbrvmrf4mx0fxbfaphbzgqgwn8v6lkfk2vyrs0znxrs1xyc5r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/matoous/go-nanoid";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/matoous/go-nanoid";
|
||||
rev = "eab626deece6";
|
||||
sha256 = "1a82lclk56y7c44jg7wn5vq733dmn0g20r5yqbchrxnpfl75dw89";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/russross/blackfriday";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/russross/blackfriday";
|
||||
rev = "v2.0.1";
|
||||
sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sevlyar/go-daemon";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sevlyar/go-daemon";
|
||||
rev = "v0.1.5";
|
||||
sha256 = "1y3gnxaifykcjcbzx91lz9bc93b95w3xj4rjxjbii26pm3j7gqyk";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/shurcooL/sanitized_anchor_name";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "v1.22.2";
|
||||
sha256 = "10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "88737f569e3a";
|
||||
sha256 = "02vkqfd6kc28zm6lffagw8nr78sayv6jabfgk9dcifl7826vi3k7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "81d4e9dc473e";
|
||||
sha256 = "0074zjpkhclz5qbgjv0zmdwy6hmf5k2ri5yagnm6i12ahxaa48dr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/check.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/check.v1";
|
||||
rev = "20d25e280405";
|
||||
sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "v2.2.2";
|
||||
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
|
||||
};
|
||||
}
|
||||
]
|
23
pkgs/applications/misc/timew-sync-server/default.nix
Normal file
23
pkgs/applications/misc/timew-sync-server/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "timew-sync-server";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timewarrior-synchronize";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "041j618c2bcryhgi2j2w5zlfcxcklgbir2xj3px4w7jxbbg6p68n";
|
||||
};
|
||||
|
||||
vendorSha256 = "0wbd4cpswgbr839sk8qwly8gjq4lqmq448m624akll192mzm9wj7";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/timewarrior-synchronize/timew-sync-server";
|
||||
description = "Server component of timewarrior synchronization application";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.joachimschmidt557 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
version = "0.7.2";
|
||||
version = "0.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sayanarijit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1mqxnahhbf394niyc8i6gk2y3i7lj9cj71k460r58cmir5fch82m";
|
||||
sha256 = "00kmmdwwf9cll25bkszgin2021ggf9b28jlcpicin5kgw4iwlhkj";
|
||||
};
|
||||
|
||||
cargoSha256 = "1dfcmkfclkq5b103jl98yalcl3mnvsq8xpkdasf72d3wgzarih16";
|
||||
cargoSha256 = "1j43vwb885h355wdmjijz1qpkqn1dmb93hwi6vc035vkbbxs1g4r";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "90.0.4430.93",
|
||||
"sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk",
|
||||
"sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6",
|
||||
"version": "90.0.4430.212",
|
||||
"sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb",
|
||||
"sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-02-09",
|
||||
|
|
|
@ -7,12 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "surf";
|
||||
version = "unstable-2019-02-08";
|
||||
version = "2.1";
|
||||
|
||||
# tarball is missing file common.h
|
||||
src = fetchgit {
|
||||
url = "git://git.suckless.org/surf";
|
||||
rev = "d068a3878b6b9f2841a49cd7948cdf9d62b55585";
|
||||
sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m";
|
||||
rev = version;
|
||||
sha256 = "1v926hiayddylq79n8l7dy51bm0dsa9n18nx9bkhg666cx973x4z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
, dmidecode
|
||||
, util-linux
|
||||
, bashInteractive
|
||||
, overrideEtc ? true
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -64,6 +65,9 @@ buildGoPackage rec {
|
|||
--replace '"script"' '"${util-linux}/bin/script"'
|
||||
|
||||
echo "${version}" > VERSION
|
||||
'' + lib.optionalString overrideEtc ''
|
||||
substituteInPlace agent/appconfig/constants_unix.go \
|
||||
--replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"'
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
|
@ -96,6 +100,20 @@ buildGoPackage rec {
|
|||
popd
|
||||
'';
|
||||
|
||||
# These templates retain their `.template` extensions on installation. The
|
||||
# amazon-ssm-agent.json.template is required as default configuration when an
|
||||
# amazon-ssm-agent.json isn't present. Here, we retain the template to show
|
||||
# we're using the default configuration.
|
||||
|
||||
# seelog.xml isn't actually required to run, but it does ship as a template
|
||||
# with debian packages, so it's here for reference. Future work in the nixos
|
||||
# module could use this template and substitute a different log level.
|
||||
postInstall = ''
|
||||
mkdir -p $out/etc/amazon/ssm
|
||||
cp go/src/${goPackagePath}/amazon-ssm-agent.json.template $out/etc/amazon/ssm/amazon-ssm-agent.json.template
|
||||
cp go/src/${goPackagePath}/seelog_unix.xml $out/etc/amazon/ssm/seelog.xml.template
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin
|
||||
'';
|
||||
|
|
|
@ -4,7 +4,7 @@ with ocamlPackages;
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "jackline";
|
||||
version = "unstable-2020-09-03";
|
||||
version = "unstable-2021-04-23";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
|
@ -13,8 +13,8 @@ buildDunePackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "hannesm";
|
||||
repo = "jackline";
|
||||
rev = "dd5f19636c9b99b72c348f0f639452d87b7c017c";
|
||||
sha256 = "076smdgig4nwvqsqxa6gsl0c3daq5agwgzp4n2y8xxm3qiq91y89";
|
||||
rev = "861c59bb7cd27ad5c7558ff94cb0d0e8dca249e5";
|
||||
sha256 = "00waw5qr0n70i9l9b25r9ryfi836x4qrj046bb4k9qa4d0p8q1sa";
|
||||
};
|
||||
|
||||
nativeBuildInpts = [
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
, pkg-config
|
||||
, kirigami2
|
||||
, libdeltachat
|
||||
, qtimageformats
|
||||
, qtmultimedia
|
||||
}:
|
||||
|
||||
|
@ -29,6 +30,7 @@ mkDerivation rec {
|
|||
buildInputs = [
|
||||
kirigami2
|
||||
libdeltachat
|
||||
qtimageformats
|
||||
qtmultimedia
|
||||
];
|
||||
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, Security
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
@ -20,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
patches = [ ./ignore-networking-tests.patch ];
|
||||
checkType = "debug";
|
||||
|
@ -36,6 +39,6 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://nymtech.net";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
platforms = with platforms; intersectLists (linux ++ darwin) (concatLists [ x86 x86_64 aarch64 arm ]);
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,23 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.6.4";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "12g9067knppkci2acc4w9xcismgw2w1zd0f1swbzdnx8bxl3vg9i";
|
||||
sha256 = "07gfi0l9l19cy7304v18knbfhs7zqhfglw0jjhcmxa79dg6wzdia";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix missing multierr package on go.mod
|
||||
./fix-go-mod-deps.patch
|
||||
];
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorSha256 = "0z5qvgmmrwwvhpmhjxdvgdfsd60a24q9ld68ggnkv36qln0gw7p4";
|
||||
vendorSha256 = "0rcb384yxk1dsip15qh32rkd07i2zzr1k53wcfpnrgi6jpixvsvi";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
|
|
@ -1,128 +0,0 @@
|
|||
diff --git a/agent/go.mod b/agent/go.mod
|
||||
index c075083..b79726e 100644
|
||||
--- a/agent/go.mod
|
||||
+++ b/agent/go.mod
|
||||
@@ -28,6 +28,7 @@ require (
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/shellhub-io/shellhub v0.5.2
|
||||
github.com/sirupsen/logrus v1.8.1
|
||||
+ go.uber.org/multierr v1.6.0 // indirect
|
||||
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
|
||||
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect
|
||||
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
|
||||
diff --git a/agent/go.sum b/agent/go.sum
|
||||
index e65c9ad..0f9afcd 100644
|
||||
--- a/agent/go.sum
|
||||
+++ b/agent/go.sum
|
||||
@@ -62,7 +62,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
@@ -73,7 +72,6 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
|
||||
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
|
||||
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
|
||||
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
-github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
|
||||
@@ -87,9 +85,7 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv
|
||||
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
|
||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
||||
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
|
||||
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
|
||||
@@ -113,7 +109,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
|
||||
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
||||
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
|
||||
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
|
||||
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
@@ -124,15 +119,18 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9
|
||||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
|
||||
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
|
||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
|
||||
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
|
||||
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
|
||||
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
@@ -148,7 +146,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
@@ -169,17 +166,13 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
|
||||
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
|
||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M=
|
||||
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
@@ -197,14 +190,12 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
|
||||
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
|
||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
|
||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||
google.golang.org/genproto v0.0.0-20210224155714-063164c882e6 h1:bXUwz2WkXXrXgiLxww3vWmoSHLOGv4ipdPdTvKymcKw=
|
||||
@@ -223,7 +214,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
|
||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
-google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA=
|
||||
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
|
||||
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
|
||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
@@ -233,7 +223,6 @@ gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXa
|
||||
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
|
||||
gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M=
|
||||
gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
|
||||
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
@ -14,20 +14,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kstars";
|
||||
version = "3.5.2";
|
||||
version = "3.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
|
||||
sha256 = "sha256-iX7rMQbctdK3AeH4ZvH+T4rv1ZHwn55urJh150KoXXU=";
|
||||
sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patches ksutils.cpp to use nix store prefixes to find program binaries of
|
||||
# indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn
|
||||
# indi servers for local telescope/camera control.
|
||||
./fs-fixes.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio
|
||||
|
@ -41,8 +34,8 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DINDI_NIX_ROOT=${indi-full}"
|
||||
"-DXPLANET_NIX_ROOT=${xplanet}"
|
||||
"-DINDI_PREFIX=${indi-full}"
|
||||
"-DXPLANET_PREFIX=${xplanet}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
--- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600
|
||||
+++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600
|
||||
@@ -5,6 +5,9 @@
|
||||
set (KSTARS_BUILD_RELEASE "Stable")
|
||||
set (CMAKE_CXX_STANDARD 11)
|
||||
|
||||
+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT})
|
||||
+add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT})
|
||||
+
|
||||
# Build KStars Lite with -DBUILD_KSTARS_LITE=ON
|
||||
option(BUILD_KSTARS_LITE "Build KStars Lite" OFF)
|
||||
|
||||
--- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600
|
||||
+++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600
|
||||
@@ -1081,6 +1081,10 @@
|
||||
// We support running within Snaps, Flatpaks, and AppImage
|
||||
// The path should accomodate the differences between the different
|
||||
// packaging solutions
|
||||
+ #define STR_EXPAND(x) #x
|
||||
+ #define STR(x) STR_EXPAND(x)
|
||||
+ QString indi_prefix = QString(STR(INDI_NIX_ROOT));
|
||||
+ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT));
|
||||
QString snap = QProcessEnvironment::systemEnvironment().value("SNAP");
|
||||
QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST");
|
||||
QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR");
|
||||
@@ -1110,21 +1114,21 @@
|
||||
#if defined(Q_OS_OSX)
|
||||
return "/usr/local/bin/indiserver";
|
||||
#endif
|
||||
- return prefix + "/bin/indiserver";
|
||||
+ return indi_prefix + "/bin/indiserver";
|
||||
}
|
||||
else if (option == "INDIHubAgent")
|
||||
{
|
||||
#if defined(Q_OS_OSX)
|
||||
return "/usr/local/bin/indihub-agent";
|
||||
#endif
|
||||
- return prefix + "/bin/indihub-agent";
|
||||
+ return indi_prefix + "/bin/indihub-agent";
|
||||
}
|
||||
else if (option == "indiDriversDir")
|
||||
{
|
||||
#if defined(Q_OS_OSX)
|
||||
return "/usr/local/share/indi";
|
||||
#elif defined(Q_OS_LINUX)
|
||||
- return prefix + "/share/indi";
|
||||
+ return indi_prefix + "/share/indi";
|
||||
#else
|
||||
return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory);
|
||||
#endif
|
||||
@@ -1181,7 +1185,7 @@
|
||||
#if defined(Q_OS_OSX)
|
||||
return "/usr/local/bin/xplanet";
|
||||
#endif
|
||||
- return prefix + "/bin/xplanet";
|
||||
+ return xplanet_prefix + "/bin/xplanet";
|
||||
}
|
||||
else if (option == "ASTAP")
|
||||
{
|
|
@ -1,28 +1,16 @@
|
|||
{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}:
|
||||
{lib, stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, xz, pkg-config}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luntergroup";
|
||||
repo = "octopus";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sPOBZ0YrEdjMNVye/xwqwA5IpsLy2jWN3sm/ce1fLg4=";
|
||||
sha256 = "sha256-FAogksVxUlzMlC0BqRu22Vchj6VX+8yNlHRLyb3g1sE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport TZ patchs (https://github.com/luntergroup/octopus/issues/149)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/luntergroup/octopus/commit/3dbd8cc33616129ad356e99a4dae82e4f6702250.patch";
|
||||
sha256 = "sha256-UCufVU9x+L1zCEhkr/48KFYRvh8w26w8Jr+O+wULKK8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/luntergroup/octopus/commit/af5a66a2792bd098fb53eb79fb4822625f09305e.patch";
|
||||
sha256 = "sha256-r8jv6EZHfTWVLYUBau3F+ilOd9IeH8rmatorEY5LXP4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost gmp htslib zlib xz ];
|
||||
|
||||
|
|
|
@ -17,14 +17,14 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.31.36";
|
||||
version = "14.31.38";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "sha256-YwXgRRUZ75l1ZptscsZae2mwkRkYXJeWSrPvw+R6TkI=";
|
||||
sha256 = "sha256-yXJ1KtTH3bi24GFiVXu8zzQkreDkqbCxgm7fVoSJepg=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
@ -92,4 +92,8 @@ mkDerivation (common "tamarin-prover" src // {
|
|||
tamarin-prover-term
|
||||
tamarin-prover-theory
|
||||
];
|
||||
|
||||
# tamarin-prover 1.6 is incompatible with maude 3.1.
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
broken = true;
|
||||
})
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
+vte_terminal_get_selection(VteTerminal *terminal) noexcept
|
||||
+{
|
||||
+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
|
||||
+ return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str);
|
||||
+ return g_strdup (IMPL(terminal)->m_selection[vte::to_integral(vte::platform::ClipboardType::PRIMARY)]->str);
|
||||
+}
|
||||
+
|
||||
/**
|
||||
|
|
|
@ -34,13 +34,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wayst";
|
||||
version = "unstable-2020-10-12";
|
||||
version = "unstable-2021-04-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "91861";
|
||||
repo = pname;
|
||||
rev = "b8c7ca00a785a748026ed1ba08bf3d19916ced18";
|
||||
hash = "sha256-wHAU1yxukxApzhLLLctZ/AYqF7t21HQc5omPBZyxra0=";
|
||||
rev = "e72ca78ef72c7b1e92473a98d435a3c85d7eab98";
|
||||
hash = "sha256-UXAVSfVpk/8KSg4oMw2tVWImD6HqJ7gEioR2MqhUUoQ=";
|
||||
};
|
||||
|
||||
makeFlags = [ "INSTALL_DIR=\${out}/bin" ];
|
||||
|
@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A simple terminal emulator";
|
||||
mainProgram = "wayst";
|
||||
homepage = "https://github.com/91861/wayst";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
|
||||
{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gitoxide";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "gitoxide";
|
||||
rev = "v${version}";
|
||||
sha256 = "qt1IN/5+yw5lrQ00YsvXUcUXCxd97EtNf5JvxJVa7uc=";
|
||||
sha256 = "12f5qrrfjfqp1aph2nmfi9nyzs1ndvgrb3y53mrszm9kf7fa6pyg";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-LH8IkleBG9sdaYBAFZt2fgeDf0s24Uv57gbGyM6OEMo=";
|
||||
cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
, glib
|
||||
, cairo
|
||||
, keybinder3
|
||||
, ffmpeg_3
|
||||
, ffmpeg
|
||||
, python3
|
||||
, libxml2
|
||||
, gst_all_1
|
||||
|
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg_3 gifski ]})
|
||||
gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ which ffmpeg gifski ]})
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/phw/peek";
|
||||
description = "Simple animated GIF screen recorder with an easy to use interface";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ puffnfresh ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
------------------------------------------------------------------------
|
||||
r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines
|
||||
|
||||
Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion).
|
||||
|
||||
|
||||
Index: iodev/display/voodoo_data.h
|
||||
===================================================================
|
||||
--- a/iodev/display/voodoo_data.h (revision 13881)
|
||||
+++ b/iodev/display/voodoo_data.h (revision 13882)
|
||||
@@ -1837,11 +1837,11 @@
|
||||
|
||||
/* fifo content defines */
|
||||
#define FIFO_TYPES (7 << 29)
|
||||
-#define FIFO_WR_REG (1 << 29)
|
||||
-#define FIFO_WR_TEX (2 << 29)
|
||||
-#define FIFO_WR_FBI_32 (3 << 29)
|
||||
-#define FIFO_WR_FBI_16L (4 << 29)
|
||||
-#define FIFO_WR_FBI_16H (5 << 29)
|
||||
+#define FIFO_WR_REG (1U << 29)
|
||||
+#define FIFO_WR_TEX (2U << 29)
|
||||
+#define FIFO_WR_FBI_32 (3U << 29)
|
||||
+#define FIFO_WR_FBI_16L (4U << 29)
|
||||
+#define FIFO_WR_FBI_16H (5U << 29)
|
||||
|
||||
BX_CPP_INLINE void fifo_reset(fifo_state *f)
|
||||
{
|
||||
|
||||
------------------------------------------------------------------------
|
|
@ -26,7 +26,11 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3";
|
||||
};
|
||||
|
||||
patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ];
|
||||
patches = [
|
||||
./bochs-2.6.11-glibc-2.26.patch
|
||||
./fix-build-smp.patch
|
||||
./bochs_fix_narrowing_conv_warning.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "runc";
|
||||
version = "1.0.0-rc93";
|
||||
version = "1.0.0-rc94";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencontainers";
|
||||
repo = "runc";
|
||||
rev = "v${version}";
|
||||
sha256 = "008d5wkznic80n5q1vwx727qn5ifalc7cydq68hc1gk9wrhna4v4";
|
||||
sha256 = "sha256-53P48jNSfC6ELpZNI30yAf7kofUsrJpNY96u0UT+ITg=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/opencontainers/runc";
|
||||
|
|
|
@ -30,8 +30,19 @@ rustPlatform.buildRustPackage rec {
|
|||
cargoBuildFlags = [
|
||||
"--features=notmuch"
|
||||
"--features=maildir"
|
||||
"--features=pulseaudio"
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace src/util.rs \
|
||||
--replace "/usr/share/i3status-rust" "$out/share"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share
|
||||
cp -R files/* $out/share
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin"
|
||||
'';
|
||||
|
|
|
@ -6,37 +6,41 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "river";
|
||||
version = "unstable-2021-04-27";
|
||||
version = "unstable-2021-05-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ifreund";
|
||||
repo = pname;
|
||||
rev = "0c8e718d95a6a621b9cba0caa9158915e567b076";
|
||||
sha256 = "1jjh0dzxi7hy4mg8vag6ipfwb9qxm5lfc07njp1mx6m81nq76ybk";
|
||||
rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d";
|
||||
sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
buildInputs = [ xwayland wayland-protocols wlroots pixman
|
||||
buildInputs = [ wayland-protocols wlroots pixman
|
||||
libxkbcommon pixman udev libevdev libX11 libGL
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
zig build -Drelease-safe -Dxwayland -Dman-pages --prefix $out install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ zig wayland scdoc pkg-config ];
|
||||
nativeBuildInputs = [ zig wayland xwayland scdoc pkg-config ];
|
||||
|
||||
# Builder patch install dir into river to get default config
|
||||
# When installFlags is removed, river becomes half broken
|
||||
# see https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
|
||||
installFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A dynamic tiling wayland compositor";
|
||||
longDescription = ''
|
||||
river is a dynamic tiling wayland compositor that takes inspiration from dwm and bspwm.
|
||||
'';
|
||||
homepage = "https://github.com/ifreund/river";
|
||||
description = "A dynamic tiling wayland compositor";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ branwright1 ];
|
||||
|
|
|
@ -1,103 +0,0 @@
|
|||
{ lib, stdenv, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
|
||||
, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
|
||||
, extraModulePaths ? []
|
||||
, version }:
|
||||
|
||||
let
|
||||
contrib = (fetchgit {
|
||||
url = "https://github.com/stumpwm/stumpwm-contrib.git";
|
||||
rev = "9bebe3622b2b6c31a6bada9055ef3862fa79b86f";
|
||||
sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc";
|
||||
});
|
||||
versionSpec = {
|
||||
latest = {
|
||||
name = "1.0.0";
|
||||
rev = "refs/tags/1.0.0";
|
||||
sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb";
|
||||
patches = [];
|
||||
};
|
||||
"0.9.9" = {
|
||||
name = "0.9.9";
|
||||
rev = "refs/tags/0.9.9";
|
||||
sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k";
|
||||
patches = [ ./fix-module-path.patch ];
|
||||
};
|
||||
git = {
|
||||
name = "git-20170203";
|
||||
rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97";
|
||||
sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70";
|
||||
patches = [];
|
||||
};
|
||||
}.${version};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "stumpwm-${versionSpec.name}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/stumpwm/stumpwm";
|
||||
rev = versionSpec.rev;
|
||||
sha256 = versionSpec.sha256;
|
||||
};
|
||||
|
||||
# NOTE: The patch needs an update for the next release.
|
||||
# `(stumpwm:set-module-dir "@MODULE_DIR@")' needs to be in it.
|
||||
patches = versionSpec.patches;
|
||||
|
||||
buildInputs = [
|
||||
texinfo4 makeWrapper autoconf
|
||||
sbcl
|
||||
lispPackages.clx
|
||||
lispPackages.cl-ppcre
|
||||
lispPackages.alexandria
|
||||
xdpyinfo
|
||||
];
|
||||
|
||||
|
||||
# Stripping destroys the generated SBCL image
|
||||
dontStrip = true;
|
||||
|
||||
configurePhase = ''
|
||||
./autogen.sh
|
||||
./configure --prefix=$out --with-module-dir=$out/share/stumpwm/modules
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cp -r --no-preserve=mode ${contrib} modules
|
||||
substituteInPlace head.lisp \
|
||||
--replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out/bin
|
||||
make install
|
||||
|
||||
mkdir -p $out/share/stumpwm/modules
|
||||
cp -r modules/* $out/share/stumpwm/modules/
|
||||
for d in ${lib.concatStringsSep " " extraModulePaths}; do
|
||||
cp -r --no-preserve=mode "$d" $out/share/stumpwm/modules/
|
||||
done
|
||||
|
||||
# Copy stumpish;
|
||||
cp $out/share/stumpwm/modules/util/stumpish/stumpish $out/bin/
|
||||
chmod +x $out/bin/stumpish
|
||||
wrapProgram $out/bin/stumpish \
|
||||
--prefix PATH ":" "${lib.makeBinPath [ rlwrap gnused gnugrep coreutils xprop ]}"
|
||||
|
||||
# Paths in the compressed image $out/bin/stumpwm are not
|
||||
# recognized by Nix. Add explicit reference here.
|
||||
mkdir $out/nix-support
|
||||
echo ${xdpyinfo} > $out/nix-support/xdpyinfo
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit sbcl lispPackages contrib;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiling window manager for X11";
|
||||
homepage = "https://github.com/stumpwm/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
broken = true; # 2018-04-11
|
||||
};
|
||||
}
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/make-image.lisp.in b/make-image.lisp.in
|
||||
index 121e9d6..2210242 100644
|
||||
--- a/make-image.lisp.in
|
||||
+++ b/make-image.lisp.in
|
||||
@@ -2,7 +2,10 @@
|
||||
|
||||
(load "load-stumpwm.lisp")
|
||||
|
||||
-#-ecl (stumpwm:set-module-dir "@CONTRIB_DIR@")
|
||||
+(setf asdf::*immutable-systems*
|
||||
+ (uiop:list-to-hash-set (asdf:already-loaded-systems)))
|
||||
+
|
||||
+#-ecl (stumpwm:set-module-dir "@MODULE_DIR@")
|
||||
|
||||
#+sbcl
|
||||
(sb-ext:save-lisp-and-die "stumpwm" :toplevel (lambda ()
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita-manjaro";
|
||||
version = "1.8";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0zxj20inwdfxhsc7cq6b3ijkxmrhnrwvbmyb1lw4vfjs4p4wrws0";
|
||||
sha256 = "1si0gaa1njyf4194i6rbx4qjp31sw238svvb2x8r8cfhm8mkhm8d";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "9.0";
|
||||
version = "9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "12mgs9f8mwfpdpxdwyknw7zvgaqp96kzcv7fcrvrnm9i4ind5zra";
|
||||
sha256 = "0974pfcdbhajxvd6fnp2kix963s28n2il9w879h5zm1f6ayglsfz";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-appindicator";
|
||||
version = "36";
|
||||
version = "37";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ubuntu";
|
||||
repo = "gnome-shell-extension-appindicator";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq";
|
||||
sha256 = "1yss91n94laakzhym409iyjs5gwhln2pkq0zrdrsxc3z70zlslxl";
|
||||
};
|
||||
|
||||
# This package has a Makefile, but it's used for building a zip for
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-arcmenu";
|
||||
version = "5";
|
||||
version = "10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arcmenu";
|
||||
repo = "ArcMenu";
|
||||
rev = "v${version}";
|
||||
sha256 = "1w4avvnp08l7lkf76vc7wvfn1cd81l4r4dhz8qnai49rvrjgqcg3";
|
||||
sha256 = "04kn3gnjz1wakp0pyiwm0alf0pwsralhis36miif9i6l5iv6a394";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
let unwrapped = mkXfceDerivation {
|
||||
category = "xfce";
|
||||
pname = "thunar";
|
||||
version = "4.16.6";
|
||||
version = "4.16.8";
|
||||
|
||||
sha256 = "12zqwazsqdmghy4h2c4fwxha069l07d46i512395y22h7n6655rn";
|
||||
sha256 = "1r7qkd6l0mgf97m1xnnizm7fkvl4a52r3hsds5z68y6myvb78p18";
|
||||
|
||||
nativeBuildInputs = [
|
||||
docbook_xsl
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, writeText, erlang, rebar3, openssl, libyaml,
|
||||
{ stdenv, writeText, erlang, rebar3WithPlugins, openssl, libyaml,
|
||||
pc, lib }:
|
||||
|
||||
{ name, version
|
||||
|
@ -19,7 +19,10 @@ with lib;
|
|||
let
|
||||
debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info";
|
||||
|
||||
ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);
|
||||
rebar3 = rebar3WithPlugins {
|
||||
plugins = buildPlugins;
|
||||
globalPlugins = (if compilePorts then [pc] else []);
|
||||
};
|
||||
|
||||
shell = drv: stdenv.mkDerivation {
|
||||
name = "interactive-shell-${drv.name}";
|
||||
|
@ -36,13 +39,9 @@ let
|
|||
inherit version;
|
||||
|
||||
buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
|
||||
propagatedBuildInputs = unique (beamDeps ++ ownPlugins);
|
||||
propagatedBuildInputs = unique beamDeps;
|
||||
|
||||
dontStrip = true;
|
||||
# The following are used by rebar3-nix-bootstrap
|
||||
inherit compilePorts;
|
||||
buildPlugins = ownPlugins;
|
||||
|
||||
inherit src;
|
||||
|
||||
setupHook = writeText "setupHook.sh" ''
|
||||
|
|
|
@ -18,8 +18,8 @@ let
|
|||
inherit callPackage erlang;
|
||||
beamPackages = self;
|
||||
|
||||
inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins;
|
||||
rebar = callPackage ../tools/build-managers/rebar { };
|
||||
rebar3 = callPackage ../tools/build-managers/rebar3 { };
|
||||
|
||||
# rebar3 port compiler plugin is required by buildRebar3
|
||||
pc = callPackage ./pc { };
|
||||
|
|
|
@ -68,7 +68,7 @@ let majorVersion = "11";
|
|||
url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
|
||||
sha256 = ""; # TODO: uncomment and check hash when available.
|
||||
}) */
|
||||
++ optional langAda ../gnat-cflags.patch
|
||||
++ optional langAda ../gnat-cflags-11.patch
|
||||
++ optional langFortran ../gfortran-driving.patch
|
||||
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
|
||||
|
||||
|
|
35
pkgs/development/compilers/gcc/gnat-cflags-11.patch
Normal file
35
pkgs/development/compilers/gcc/gnat-cflags-11.patch
Normal file
|
@ -0,0 +1,35 @@
|
|||
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
|
||||
index 4e74252bd74..0d848b5b4e3 100644
|
||||
--- a/gcc/ada/gcc-interface/Makefile.in
|
||||
+++ b/gcc/ada/gcc-interface/Makefile.in
|
||||
@@ -111,7 +111,7 @@ NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer
|
||||
NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls
|
||||
NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
|
||||
GNATLIBFLAGS = -W -Wall -gnatg -nostdinc
|
||||
-GNATLIBCFLAGS = -g -O2
|
||||
+GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
|
||||
# Pretend that _Unwind_GetIPInfo is available for the target by default. This
|
||||
# should be autodetected during the configuration of libada and passed down to
|
||||
# here, but we need something for --disable-libada and hope for the best.
|
||||
@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
|
||||
# Link flags used to build gnat tools. By default we prefer to statically
|
||||
# link with libgcc to avoid a dependency on shared libgcc (which is tricky
|
||||
# to deal with as it may conflict with the libgcc provided by the system).
|
||||
-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc
|
||||
+GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc $(CFLAGS_FOR_TARGET)
|
||||
|
||||
# End of variables for you to override.
|
||||
|
||||
diff --git a/libada/Makefile.in b/libada/Makefile.in
|
||||
index 522b9207326..ca866c74471 100644
|
||||
--- a/libada/Makefile.in
|
||||
+++ b/libada/Makefile.in
|
||||
@@ -59,7 +59,7 @@ LDFLAGS=
|
||||
CFLAGS=-g
|
||||
PICFLAG = @PICFLAG@
|
||||
GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
|
||||
-GNATLIBCFLAGS= -g -O2
|
||||
+GNATLIBCFLAGS= -g -O2 $(CFLAGS)
|
||||
GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \
|
||||
-fexceptions -DIN_RTS @have_getipinfo@ @have_capability@
|
||||
|
|
@ -6,7 +6,7 @@ with lib; mkCoqDerivation {
|
|||
owner = "thery";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = "8.12"; out = "8.12"; }
|
||||
{ case = range "8.12" "8.13"; out = "8.12"; }
|
||||
{ case = range "8.10" "8.11"; out = "8.10"; }
|
||||
{ case = range "8.8" "8.9"; out = "8.8"; }
|
||||
{ case = "8.7"; out = "8.7.2"; }
|
||||
|
|
22
pkgs/development/coq-modules/mathcomp-zify/default.nix
Normal file
22
pkgs/development/coq-modules/mathcomp-zify/default.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation rec {
|
||||
pname = "mathcomp-zify";
|
||||
repo = "mczify";
|
||||
owner = "math-comp";
|
||||
inherit version;
|
||||
|
||||
defaultVersion = with versions;
|
||||
switch [ coq.coq-version mathcomp-algebra.version ] [
|
||||
{ cases = [ (isEq "8.13") (isEq "1.12") ]; out = "1.0.0+1.12+8.13"; }
|
||||
] null;
|
||||
|
||||
release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-algebra ];
|
||||
|
||||
meta = {
|
||||
description = "Micromega tactics for Mathematical Components";
|
||||
maintainers = with maintainers; [ cohencyril ];
|
||||
};
|
||||
}
|
|
@ -4,7 +4,7 @@ with lib; mkCoqDerivation {
|
|||
pname = "metalib";
|
||||
owner = "plclub";
|
||||
inherit version;
|
||||
defaultVersion = if versions.range "8.10" "8.12" coq.coq-version then "20200527" else null;
|
||||
defaultVersion = if versions.range "8.10" "8.13" coq.coq-version then "20200527" else null;
|
||||
release."20200527".rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8";
|
||||
release."20200527".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs";
|
||||
|
||||
|
|
|
@ -61,6 +61,7 @@ self: super: {
|
|||
hsakamai = dontCheck super.hsakamai;
|
||||
hsemail-ns = dontCheck super.hsemail-ns;
|
||||
openapi3 = dontCheck super.openapi3;
|
||||
strict-writer = dontCheck super.strict-writer;
|
||||
|
||||
# https://github.com/ekmett/half/issues/35
|
||||
half = dontCheck super.half;
|
||||
|
|
|
@ -1037,9 +1037,6 @@ self: super: {
|
|||
# Has tasty < 1.2 requirement, but works just fine with 1.2
|
||||
temporary-resourcet = doJailbreak super.temporary-resourcet;
|
||||
|
||||
# Requires dhall >= 1.23.0
|
||||
ats-pkg = dontCheck (super.ats-pkg.override { dhall = self.dhall_1_29_0; });
|
||||
|
||||
# fake a home dir and capture generated man page
|
||||
ats-format = overrideCabal super.ats-format (old : {
|
||||
preConfigure = "export HOME=$PWD";
|
||||
|
@ -1068,18 +1065,6 @@ self: super: {
|
|||
# https://github.com/erikd/hjsmin/issues/32
|
||||
hjsmin = dontCheck super.hjsmin;
|
||||
|
||||
nix-tools = super.nix-tools.overrideScope (self: super: {
|
||||
# Needs https://github.com/peti/hackage-db/pull/9
|
||||
hackage-db = super.hackage-db.overrideAttrs (old: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ElvishJerricco";
|
||||
repo = "hackage-db";
|
||||
rev = "84ca9fc75ad45a71880e938e0d93ea4bde05f5bd";
|
||||
sha256 = "0y3kw1hrxhsqmyx59sxba8npj4ya8dpgjljc21gkgdvdy9628q4c";
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
# upstream issue: https://github.com/vmchale/atspkg/issues/12
|
||||
language-ats = dontCheck super.language-ats;
|
||||
|
||||
|
@ -1864,4 +1849,44 @@ self: super: {
|
|||
# 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.
|
||||
tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;
|
||||
|
||||
# 2021-05-09 haskell-ci pins ShellCheck 0.7.1
|
||||
# https://github.com/haskell-CI/haskell-ci/issues/507
|
||||
haskell-ci = super.haskell-ci.override {
|
||||
ShellCheck = self.ShellCheck_0_7_1;
|
||||
};
|
||||
|
||||
Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: {
|
||||
# https://github.com/adamConnerSax/Frames-streamly/issues/1
|
||||
patchPhase = ''
|
||||
cat > example_data/acs100k.csv <<EOT
|
||||
"YEAR","REGION","STATEFIP","DENSITY","METRO","PUMA","PERWT","SEX","AGE","RACE","RACED","HISPAN","HISPAND","CITIZEN","LANGUAGE","LANGUAGED","SPEAKENG","EDUC","EDUCD","GRADEATT","GRADEATTD","EMPSTAT","EMPSTATD","INCTOT","INCSS","POVERTY"
|
||||
2006,32,1,409.6,3,2300,87.0,1,47,1,100,0,0,0,1,100,3,6,65,0,0,1,12,36000,0,347
|
||||
EOT
|
||||
''; });
|
||||
|
||||
# 2021-05-09: compilation requires patches from master,
|
||||
# remove at next release (current is 0.1.0.4).
|
||||
large-hashable = appendPatches super.large-hashable [
|
||||
# Fix compilation of TH code for GHC >= 8.8
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/factisresearch/large-hashable/commit/ee7afe4bd181cf15a324c7f4823f7a348e4a0e6b.patch";
|
||||
sha256 = "1ha77v0bc6prxacxhpdfgcsgw8348gvhl9y81smigifgjbinphxv";
|
||||
excludes = [
|
||||
".travis.yml"
|
||||
"stack**"
|
||||
];
|
||||
})
|
||||
# Fix cpp invocation
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/factisresearch/large-hashable/commit/7b7c2ed6ac6e096478e8ee00160fa9d220df853a.patch";
|
||||
sha256 = "1sf9h3k8jbbgfshzrclaawlwx7k2frb09z2a64f93jhvk6ci6vgx";
|
||||
})
|
||||
];
|
||||
|
||||
# BSON defaults to requiring network instead of network-bsd which is
|
||||
# required nowadays: https://github.com/mongodb-haskell/bson/issues/26
|
||||
bson = appendConfigureFlag (super.bson.override {
|
||||
network = self.network-bsd;
|
||||
}) "-f-_old_network";
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
|
|
@ -161,4 +161,11 @@ self: super: {
|
|||
] ++ (drv.librarySystemDepends or []);
|
||||
});
|
||||
|
||||
HTF = overrideCabal super.HTF (drv: {
|
||||
# GNU find is not prefixed in stdenv
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
|
||||
'' + (drv.postPatch or "");
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
@ -11,8 +11,7 @@ with haskellLib;
|
|||
|
||||
self: super: {
|
||||
|
||||
# This compiler version needs llvm 6.x.
|
||||
llvmPackages = pkgs.llvmPackages_6;
|
||||
llvmPackages = pkgs.llvmPackages_10;
|
||||
|
||||
# Disable GHC 8.7.x core libraries.
|
||||
array = null;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -104,6 +104,7 @@ extra-packages:
|
|||
- gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4
|
||||
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
|
||||
- gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4
|
||||
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
|
||||
|
||||
package-maintainers:
|
||||
peti:
|
||||
|
@ -219,20 +220,22 @@ package-maintainers:
|
|||
- gitit
|
||||
- yarn-lock
|
||||
- yarn2nix
|
||||
- large-hashable
|
||||
poscat:
|
||||
- hinit
|
||||
bdesham:
|
||||
- pinboard-notes-backup
|
||||
|
||||
unsupported-platforms:
|
||||
Allure: [ x86_64-darwin ]
|
||||
alsa-mixer: [ x86_64-darwin ]
|
||||
alsa-pcm: [ x86_64-darwin ]
|
||||
alsa-seq: [ x86_64-darwin ]
|
||||
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
|
||||
bdcs-api: [ x86_64-darwin ]
|
||||
bindings-sane: [ x86_64-darwin ]
|
||||
bindings-directfb: [ x86_64-darwin ]
|
||||
bindings-sane: [ x86_64-darwin ]
|
||||
cut-the-crap: [ x86_64-darwin ]
|
||||
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
|
@ -242,8 +245,9 @@ unsupported-platforms:
|
|||
Euterpea: [ x86_64-darwin ]
|
||||
freenect: [ x86_64-darwin ]
|
||||
FTGL: [ x86_64-darwin ]
|
||||
gi-dbusmenugtk3: [ x86_64-darwin ]
|
||||
ghcjs-dom-hello: [ x86_64-darwin ]
|
||||
gi-dbusmenu: [ x86_64-darwin ]
|
||||
gi-dbusmenugtk3: [ x86_64-darwin ]
|
||||
gi-ggit: [ x86_64-darwin ]
|
||||
gi-ibus: [ x86_64-darwin ]
|
||||
gi-ostree: [ x86_64-darwin ]
|
||||
|
@ -256,8 +260,12 @@ unsupported-platforms:
|
|||
HFuse: [ x86_64-darwin ]
|
||||
hidapi: [ x86_64-darwin ]
|
||||
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
hpapi: [ x86_64-darwin ]
|
||||
HSoM: [ x86_64-darwin ]
|
||||
iwlib: [ x86_64-darwin ]
|
||||
jsaddle-webkit2gtk: [ x86_64-darwin ]
|
||||
LambdaHack: [ x86_64-darwin ]
|
||||
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
|
||||
libmodbus: [ x86_64-darwin ]
|
||||
libsystemd-journal: [ x86_64-darwin ]
|
||||
libtelnet: [ x86_64-darwin ]
|
||||
|
@ -266,10 +274,10 @@ unsupported-platforms:
|
|||
lio-fs: [ x86_64-darwin ]
|
||||
logging-facade-journald: [ x86_64-darwin ]
|
||||
midi-alsa: [ x86_64-darwin ]
|
||||
mpi-hs: [ aarch64-linux, x86_64-darwin ]
|
||||
mpi-hs-binary: [ aarch64-linux, x86_64-darwin ]
|
||||
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ]
|
||||
mpi-hs-store: [ aarch64-linux, x86_64-darwin ]
|
||||
mpi-hs: [ aarch64-linux, x86_64-darwin ]
|
||||
mplayer-spot: [ aarch64-linux ]
|
||||
oculus: [ x86_64-darwin ]
|
||||
pam: [ x86_64-darwin ]
|
||||
|
@ -279,7 +287,9 @@ unsupported-platforms:
|
|||
posix-api: [ x86_64-darwin ]
|
||||
Raincat: [ x86_64-darwin ]
|
||||
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
reflex-dom: [ x86_64-darwin ]
|
||||
reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ]
|
||||
reflex-dom: [ x86_64-darwin, aarch64-linux ]
|
||||
reflex-localize-dom: [ x86_64-darwin, aarch64-linux ]
|
||||
rtlsdr: [ x86_64-darwin ]
|
||||
rubberband: [ x86_64-darwin ]
|
||||
sbv: [ aarch64-linux ]
|
||||
|
@ -290,21 +300,22 @@ unsupported-platforms:
|
|||
termonad: [ x86_64-darwin ]
|
||||
tokyotyrant-haskell: [ x86_64-darwin ]
|
||||
udev: [ x86_64-darwin ]
|
||||
verifiable-expressions: [ aarch64-linux ]
|
||||
vrpn: [ x86_64-darwin ]
|
||||
vulkan-utils: [ x86_64-darwin ]
|
||||
vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ]
|
||||
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ]
|
||||
vulkan-utils: [ x86_64-darwin ]
|
||||
webkit2gtk3-javascriptcore: [ x86_64-darwin ]
|
||||
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
xattr: [ x86_64-darwin ]
|
||||
xgboost-haskell: [ aarch64-linux, armv7l-linux ]
|
||||
XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
|
||||
|
@ -358,69 +369,26 @@ dont-distribute-packages:
|
|||
- yices-easy
|
||||
- yices-painless
|
||||
|
||||
# these packages don't evaluate because they have broken (system) dependencies
|
||||
- XML
|
||||
- comark
|
||||
- couch-simple
|
||||
# These packages don‘t build because they use deprecated webkit versions.
|
||||
- diagrams-hsqml
|
||||
- diagrams-reflex
|
||||
- dialog
|
||||
- fltkhs-demos
|
||||
- fltkhs-fluid-demos
|
||||
- fltkhs-hello-world
|
||||
- fltkhs-themes
|
||||
- ghcjs-dom-hello
|
||||
- ghcjs-dom-webkit
|
||||
- gi-javascriptcore
|
||||
- gi-webkit
|
||||
- gi-webkit2
|
||||
- gi-webkit2webextension
|
||||
- gsmenu
|
||||
- haste-gapi
|
||||
- haste-perch
|
||||
- hbro
|
||||
- hplayground
|
||||
- hs-mesos
|
||||
- hsqml
|
||||
- hsqml-datamodel
|
||||
- hsqml-datamodel-vinyl
|
||||
- hsqml-datemodel-vinyl
|
||||
- hsqml-demo-manic
|
||||
- hsqml-demo-morris
|
||||
- hsqml-demo-notes
|
||||
- hsqml-demo-notes
|
||||
- hsqml-demo-samples
|
||||
- hsqml-morris
|
||||
- hsqml-morris
|
||||
- hstorchat
|
||||
- imprevu-happstack
|
||||
- jsaddle-webkit2gtk
|
||||
- jsaddle-webkitgtk
|
||||
- jsc
|
||||
- lambdacat
|
||||
- leksah
|
||||
- manatee-all
|
||||
- manatee-browser
|
||||
- manatee-reader
|
||||
- markup-preview
|
||||
- nomyx-api
|
||||
- nomyx-core
|
||||
- nomyx-language
|
||||
- nomyx-library
|
||||
- nomyx-server
|
||||
- passman-cli
|
||||
- passman-core
|
||||
- reflex-dom-colonnade
|
||||
- reflex-dom-contrib
|
||||
- reflex-dom-fragment-shader-canvas
|
||||
- reflex-dom-helpers
|
||||
- reflex-jsx
|
||||
- sneathlane-haste
|
||||
- spike
|
||||
- tianbar
|
||||
- trasa-reflex
|
||||
- treersec
|
||||
- wai-middleware-brotli
|
||||
- web-browser-in-haskell
|
||||
- webkit
|
||||
- webkitgtk3
|
||||
|
|
File diff suppressed because it is too large
Load diff
4179
pkgs/development/haskell-modules/hackage-packages.nix
generated
4179
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babashka";
|
||||
version = "0.3.5";
|
||||
version = "0.4.0";
|
||||
|
||||
reflectionJson = fetchurl {
|
||||
name = "reflection.json";
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-tOLT5W5kK38fb9XL9jOQpw0LjHPjbn+BarckbCuwQAc=";
|
||||
sha256 = "sha256-NY78gkKJd9ATdu7Ja1AvWkaPv0PuDIKWDZBeYGMJufU=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/drycpp/lmdbxx#readme";
|
||||
homepage = "https://github.com/hoytech/lmdbxx#readme";
|
||||
description = "C++11 wrapper for the LMDB embedded B+ tree database library";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ fgaz ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, python, root, makeWrapper, zlib, withRootSupport ? false }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, python, root, makeWrapper, zlib, withRootSupport ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
|
@ -9,6 +9,24 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1x7xi6w7lb92x8202kbaxgqg1sly534wana4f38l3gpbzw9dwmcs";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix a minor bug
|
||||
# https://gitlab.com/hepcedar/yoda/-/merge_requests/38
|
||||
(fetchpatch {
|
||||
name = "yoda-fix-fuzzy-compare-bin2d.patch";
|
||||
url = "https://gitlab.com/hepcedar/yoda/-/commit/a2999d78cb3d9ed874f367bad375dc39a1a11148.diff";
|
||||
sha256 = "sha256-BsaVm+4VtCvRoEuN4r6A4bj9XwgMe75UesKzN+b56Qw=";
|
||||
})
|
||||
# fix a regression
|
||||
# https://gitlab.com/hepcedar/yoda/-/merge_requests/40
|
||||
(fetchpatch {
|
||||
name = "yoda-fix-for-yodagz.patch";
|
||||
url = "https://gitlab.com/hepcedar/yoda/-/commit/3338ba5a7466599ac6969e4ae462f133d6cf4fd8.diff";
|
||||
sha256 = "sha256-MZTOIt468bdPCS7UVfr5hQZUsVy3TpY/TjRrNySIL70=";
|
||||
excludes = [ "ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [ cython makeWrapper ];
|
||||
buildInputs = [ python ]
|
||||
++ (with python.pkgs; [ numpy matplotlib ])
|
||||
|
|
|
@ -25,6 +25,6 @@ mkDerivation rec {
|
|||
description = "Astrometric plate solving library";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ hjones2199 ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, glib, openssl, pkg-config, autoreconfHook, SystemConfiguration }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sofia-sip";
|
||||
|
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib openssl ];
|
||||
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
|
||||
homepage = "https://github.com/freeswitch/sofia-sip";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A portable and modular SIP User-Agent with audio and video support";
|
||||
homepage = "https://github.com/freeswitch/spandsp";
|
||||
platforms = with lib.platforms; linux;
|
||||
maintainers = with lib.maintainers; [ ajs124 ];
|
||||
platforms = with lib.platforms; unix;
|
||||
maintainers = with lib.maintainers; [ ajs124 misuzu ];
|
||||
license = lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, meson, ninja, pkg-config, wayland-protocols
|
||||
, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim }:
|
||||
, pipewire, wayland, systemd, libdrm, iniparser, scdoc, grim, slurp }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-wlr";
|
||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim ]}
|
||||
wrapProgram $out/libexec/xdg-desktop-portal-wlr --prefix PATH ":" ${lib.makeBinPath [ grim slurp ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -24,8 +24,8 @@ let lispPackages = rec {
|
|||
quicklispdist = pkgs.fetchurl {
|
||||
# Will usually be replaced with a fresh version anyway, but needs to be
|
||||
# a valid distinfo.txt
|
||||
url = "https://beta.quicklisp.org/dist/quicklisp/2021-02-28/distinfo.txt";
|
||||
sha256 = "sha256:1apc0s07fmm386rj866dbrhrkq3lrbgbd79kwcyp91ix7sza8z3z";
|
||||
url = "https://beta.quicklisp.org/dist/quicklisp/2021-04-11/distinfo.txt";
|
||||
sha256 = "sha256:1z7a7m9cm7iv4m9ajvyqphsw30s3qwb0l8g8ayfmkvmvhlj79g86";
|
||||
};
|
||||
buildPhase = "true; ";
|
||||
postInstall = ''
|
||||
|
@ -124,7 +124,7 @@ let lispPackages = rec {
|
|||
};
|
||||
nyxt = pkgs.lispPackages.buildLispPackage rec {
|
||||
baseName = "nyxt";
|
||||
version = "2021-03-27";
|
||||
version = "2021-05-06";
|
||||
|
||||
|
||||
description = "Browser";
|
||||
|
@ -132,6 +132,14 @@ let lispPackages = rec {
|
|||
overrides = x: {
|
||||
postInstall = ''
|
||||
echo "Building nyxt binary"
|
||||
(
|
||||
source "$out/lib/common-lisp-settings"/*-shell-config.sh
|
||||
cd "$out/lib/common-lisp"/*/
|
||||
makeFlags="''${makeFlags:-}"
|
||||
make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags all
|
||||
make LISP=common-lisp.sh NYXT_INTERNAL_QUICKLISP=false PREFIX="$out" $makeFlags install
|
||||
cp nyxt "$out/bin/nyxt"
|
||||
)
|
||||
NIX_LISP_PRELAUNCH_HOOK='
|
||||
nix_lisp_build_system nyxt/gtk-application \
|
||||
"(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \
|
||||
|
@ -181,13 +189,15 @@ let lispPackages = rec {
|
|||
fset
|
||||
cl-cffi-gtk
|
||||
cl-webkit2
|
||||
cl-gobject-introspection
|
||||
];
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nyxt";
|
||||
rev = "8ef171fd1eb62d168defe4a2d7115393230314d1";
|
||||
sha256 = "sha256:1dz55mdmj68kmllih7ab70nmp0mwzqp9lh3im7kcjfmc1r64irdv";
|
||||
# date = 2021-03-27T09:10:00+00:00;
|
||||
rev = "940a5f9a19770771cf29f8fa7505e99c3a242b67";
|
||||
sha256 = "sha256:0d5mawka26gwi9nb45x1n33vgskwyn46jrvfz7nzmm2jfaq4ipn6";
|
||||
# Version 2 pre-release 7
|
||||
# date = "2021-05-06T11:30:27Z";
|
||||
};
|
||||
|
||||
packageName = "nyxt";
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "_3bmd-ext-code-blocks";
|
||||
version = "3bmd-20201220-git";
|
||||
version = "3bmd-20210411-git";
|
||||
|
||||
description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma";
|
||||
|
||||
deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" args."trivial-with-current-source-form" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz";
|
||||
sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71";
|
||||
url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz";
|
||||
sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp";
|
||||
};
|
||||
|
||||
packageName = "3bmd-ext-code-blocks";
|
||||
|
@ -20,9 +20,9 @@ rec {
|
|||
}
|
||||
/* (SYSTEM 3bmd-ext-code-blocks DESCRIPTION
|
||||
extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma
|
||||
SHA256 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL
|
||||
http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5
|
||||
67b6e5fa51d18817e7110e4fef6517ac NAME 3bmd-ext-code-blocks FILENAME
|
||||
SHA256 1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL
|
||||
http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5
|
||||
09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd-ext-code-blocks FILENAME
|
||||
_3bmd-ext-code-blocks DEPS
|
||||
((NAME 3bmd FILENAME _3bmd) (NAME alexandria FILENAME alexandria)
|
||||
(NAME colorize FILENAME colorize) (NAME esrap FILENAME esrap)
|
||||
|
@ -33,7 +33,7 @@ rec {
|
|||
DEPENDENCIES
|
||||
(3bmd alexandria colorize esrap html-encode split-sequence
|
||||
trivial-with-current-source-form)
|
||||
VERSION 3bmd-20201220-git SIBLINGS
|
||||
VERSION 3bmd-20210411-git SIBLINGS
|
||||
(3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables
|
||||
3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd)
|
||||
PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "_3bmd";
|
||||
version = "20201220-git";
|
||||
version = "20210411-git";
|
||||
|
||||
description = "markdown processor in CL using esrap parser.";
|
||||
|
||||
deps = [ args."alexandria" args."esrap" args."split-sequence" args."trivial-with-current-source-form" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz";
|
||||
sha256 = "0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71";
|
||||
url = "http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz";
|
||||
sha256 = "1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp";
|
||||
};
|
||||
|
||||
packageName = "3bmd";
|
||||
|
@ -19,16 +19,16 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256
|
||||
0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL
|
||||
http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5
|
||||
67b6e5fa51d18817e7110e4fef6517ac NAME 3bmd FILENAME _3bmd DEPS
|
||||
1gwl3r8cffr8yldi0x7zdzbmngqhli2d19wsky5cf8h80m30k4vp URL
|
||||
http://beta.quicklisp.org/archive/3bmd/2021-04-11/3bmd-20210411-git.tgz MD5
|
||||
09f9290aa1708aeb469fb5154ab1a397 NAME 3bmd FILENAME _3bmd DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap)
|
||||
(NAME split-sequence FILENAME split-sequence)
|
||||
(NAME trivial-with-current-source-form FILENAME
|
||||
trivial-with-current-source-form))
|
||||
DEPENDENCIES
|
||||
(alexandria esrap split-sequence trivial-with-current-source-form) VERSION
|
||||
20201220-git SIBLINGS
|
||||
20210411-git SIBLINGS
|
||||
(3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-math
|
||||
3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)
|
||||
PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "alexandria";
|
||||
version = "20200925-git";
|
||||
version = "20210411-git";
|
||||
|
||||
description = "Alexandria is a collection of portable public domain utilities.";
|
||||
|
||||
deps = [ ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz";
|
||||
sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl";
|
||||
url = "http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz";
|
||||
sha256 = "0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh";
|
||||
};
|
||||
|
||||
packageName = "alexandria";
|
||||
|
@ -20,8 +20,8 @@ rec {
|
|||
}
|
||||
/* (SYSTEM alexandria DESCRIPTION
|
||||
Alexandria is a collection of portable public domain utilities. SHA256
|
||||
1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl URL
|
||||
http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz
|
||||
MD5 59c8237a854de6f4f93328cd5747cd14 NAME alexandria FILENAME alexandria
|
||||
DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (alexandria-tests)
|
||||
0bd4axr1z1q6khvpyf5xvgybdajs1dc7my6g0rdzhhxbibfcf3yh URL
|
||||
http://beta.quicklisp.org/archive/alexandria/2021-04-11/alexandria-20210411-git.tgz
|
||||
MD5 415c43451862b490577b20ee4fb8e8d7 NAME alexandria FILENAME alexandria
|
||||
DEPS NIL DEPENDENCIES NIL VERSION 20210411-git SIBLINGS (alexandria-tests)
|
||||
PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cffi-grovel";
|
||||
version = "cffi_0.23.0";
|
||||
version = "cffi_0.24.1";
|
||||
|
||||
description = "The CFFI Groveller";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
|
||||
sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
|
||||
sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh";
|
||||
};
|
||||
|
||||
packageName = "cffi-grovel";
|
||||
|
@ -19,13 +19,13 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256
|
||||
1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL
|
||||
http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5
|
||||
a43e3c440fc4f20494e6d2347887c963 NAME cffi-grovel FILENAME cffi-grovel DEPS
|
||||
1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL
|
||||
http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5
|
||||
c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-grovel FILENAME cffi-grovel DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain)
|
||||
(NAME trivial-features FILENAME trivial-features))
|
||||
DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features)
|
||||
VERSION cffi_0.23.0 SIBLINGS
|
||||
VERSION cffi_0.24.1 SIBLINGS
|
||||
(cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)
|
||||
PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cffi-toolchain";
|
||||
version = "cffi_0.23.0";
|
||||
version = "cffi_0.24.1";
|
||||
|
||||
description = "The CFFI toolchain";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
|
||||
sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
|
||||
sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh";
|
||||
};
|
||||
|
||||
packageName = "cffi-toolchain";
|
||||
|
@ -19,14 +19,14 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256
|
||||
1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL
|
||||
http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5
|
||||
a43e3c440fc4f20494e6d2347887c963 NAME cffi-toolchain FILENAME
|
||||
1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL
|
||||
http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5
|
||||
c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-toolchain FILENAME
|
||||
cffi-toolchain DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cffi FILENAME cffi)
|
||||
(NAME trivial-features FILENAME trivial-features))
|
||||
DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0
|
||||
DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1
|
||||
SIBLINGS
|
||||
(cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi)
|
||||
PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cffi-uffi-compat";
|
||||
version = "cffi_0.23.0";
|
||||
version = "cffi_0.24.1";
|
||||
|
||||
description = "UFFI Compatibility Layer for CFFI";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
|
||||
sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
|
||||
sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh";
|
||||
};
|
||||
|
||||
packageName = "cffi-uffi-compat";
|
||||
|
@ -19,14 +19,14 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI
|
||||
SHA256 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL
|
||||
http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5
|
||||
a43e3c440fc4f20494e6d2347887c963 NAME cffi-uffi-compat FILENAME
|
||||
SHA256 1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL
|
||||
http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5
|
||||
c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi-uffi-compat FILENAME
|
||||
cffi-uffi-compat DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cffi FILENAME cffi)
|
||||
(NAME trivial-features FILENAME trivial-features))
|
||||
DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0
|
||||
DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.24.1
|
||||
SIBLINGS
|
||||
(cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi)
|
||||
PARASITES NIL) */
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cffi";
|
||||
version = "cffi_0.23.0";
|
||||
version = "cffi_0.24.1";
|
||||
|
||||
parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
|
||||
|
||||
|
@ -11,8 +11,8 @@ rec {
|
|||
deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
|
||||
sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
|
||||
url = "http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz";
|
||||
sha256 = "1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh";
|
||||
};
|
||||
|
||||
packageName = "cffi";
|
||||
|
@ -21,15 +21,15 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256
|
||||
1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL
|
||||
http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5
|
||||
a43e3c440fc4f20494e6d2347887c963 NAME cffi FILENAME cffi DEPS
|
||||
1ir8a4rrnilj9f8rv1hh6fhkg2wp8z8zcf9hiijcix50pabxq8qh URL
|
||||
http://beta.quicklisp.org/archive/cffi/2021-04-11/cffi_0.24.1.tgz MD5
|
||||
c3df5c460e00e5af8b8bd2cd03a4b5cc NAME cffi FILENAME cffi DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre)
|
||||
(NAME trivial-features FILENAME trivial-features)
|
||||
(NAME uiop FILENAME uiop))
|
||||
DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop)
|
||||
VERSION cffi_0.23.0 SIBLINGS
|
||||
VERSION cffi_0.24.1 SIBLINGS
|
||||
(cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain
|
||||
cffi-uffi-compat)
|
||||
PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "chanl";
|
||||
version = "20210124-git";
|
||||
version = "20210411-git";
|
||||
|
||||
parasites = [ "chanl/examples" "chanl/tests" ];
|
||||
|
||||
|
@ -11,8 +11,8 @@ rec {
|
|||
deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz";
|
||||
sha256 = "1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc";
|
||||
url = "http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz";
|
||||
sha256 = "1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi";
|
||||
};
|
||||
|
||||
packageName = "chanl";
|
||||
|
@ -22,11 +22,11 @@ rec {
|
|||
}
|
||||
/* (SYSTEM chanl DESCRIPTION
|
||||
Communicating Sequential Process support for Common Lisp SHA256
|
||||
1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc URL
|
||||
http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz
|
||||
MD5 2f9e2d16caa2febff4f5beb6226b7ccf NAME chanl FILENAME chanl DEPS
|
||||
1c1yiw616q5hv6vzyg1y4kg68v94p37s5jrq387rwadfnnf46rgi URL
|
||||
http://beta.quicklisp.org/archive/chanl/2021-04-11/chanl-20210411-git.tgz
|
||||
MD5 efaa5705b5feaa718290d25a95e2a684 NAME chanl FILENAME chanl DEPS
|
||||
((NAME alexandria FILENAME alexandria)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
(NAME fiveam FILENAME fiveam))
|
||||
DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210124-git
|
||||
DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210411-git
|
||||
SIBLINGS NIL PARASITES (chanl/examples chanl/tests)) */
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-change-case";
|
||||
version = "20210228-git";
|
||||
version = "20210411-git";
|
||||
|
||||
parasites = [ "cl-change-case/test" ];
|
||||
|
||||
|
@ -11,8 +11,8 @@ rec {
|
|||
deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."fiveam" args."flexi-streams" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz";
|
||||
sha256 = "15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi";
|
||||
url = "http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz";
|
||||
sha256 = "14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj";
|
||||
};
|
||||
|
||||
packageName = "cl-change-case";
|
||||
|
@ -22,13 +22,13 @@ rec {
|
|||
}
|
||||
/* (SYSTEM cl-change-case DESCRIPTION
|
||||
Convert strings between camelCase, param-case, PascalCase and more SHA256
|
||||
15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi URL
|
||||
http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz
|
||||
MD5 8fec07f0634a739134dc4fcec807fe16 NAME cl-change-case FILENAME
|
||||
14s26b907h1nsnwdqbj6j4c9bvc4rc2l8ry2q1j7ibjfzqvhp4mj URL
|
||||
http://beta.quicklisp.org/archive/cl-change-case/2021-04-11/cl-change-case-20210411-git.tgz
|
||||
MD5 df72a3d71a6c65e149704688aec859b9 NAME cl-change-case FILENAME
|
||||
cl-change-case DEPS
|
||||
((NAME cl-ppcre FILENAME cl-ppcre)
|
||||
(NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode)
|
||||
(NAME cl-unicode FILENAME cl-unicode) (NAME fiveam FILENAME fiveam)
|
||||
(NAME flexi-streams FILENAME flexi-streams))
|
||||
DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode fiveam flexi-streams)
|
||||
VERSION 20210228-git SIBLINGS NIL PARASITES (cl-change-case/test)) */
|
||||
VERSION 20210411-git SIBLINGS NIL PARASITES (cl-change-case/test)) */
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-colors2";
|
||||
version = "20200218-git";
|
||||
version = "20210411-git";
|
||||
|
||||
parasites = [ "cl-colors2/tests" ];
|
||||
|
||||
|
@ -11,8 +11,8 @@ rec {
|
|||
deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz";
|
||||
sha256 = "0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29";
|
||||
url = "http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz";
|
||||
sha256 = "14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk";
|
||||
};
|
||||
|
||||
packageName = "cl-colors2";
|
||||
|
@ -21,11 +21,11 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256
|
||||
0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29 URL
|
||||
http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz
|
||||
MD5 054283564f17af46a09e259ff509b656 NAME cl-colors2 FILENAME cl-colors2
|
||||
14kdi214x8rxil27wfbx0csgi7g8dg5wsifpsrdrqph0p7ps8snk URL
|
||||
http://beta.quicklisp.org/archive/cl-colors2/2021-04-11/cl-colors2-20210411-git.tgz
|
||||
MD5 e6b54e76e7d1cfcff45955dbd4752f1d NAME cl-colors2 FILENAME cl-colors2
|
||||
DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
|
||||
(NAME clunit2 FILENAME clunit2))
|
||||
DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20200218-git SIBLINGS
|
||||
DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20210411-git SIBLINGS
|
||||
NIL PARASITES (cl-colors2/tests)) */
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-gobject-introspection";
|
||||
version = "20210124-git";
|
||||
|
||||
description = "Binding to GObjectIntrospection";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" args."trivial-garbage" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz";
|
||||
sha256 = "1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0";
|
||||
};
|
||||
|
||||
packageName = "cl-gobject-introspection";
|
||||
|
||||
asdFilesToKeep = ["cl-gobject-introspection.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl-gobject-introspection DESCRIPTION Binding to GObjectIntrospection
|
||||
SHA256 1hrc451d9xdp3pfmwalw32r3iqfvw6ccy665kl5560lihwmk59w0 URL
|
||||
http://beta.quicklisp.org/archive/cl-gobject-introspection/2021-01-24/cl-gobject-introspection-20210124-git.tgz
|
||||
MD5 ad760b820c86142c0a1309af29541680 NAME cl-gobject-introspection FILENAME
|
||||
cl-gobject-introspection DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)
|
||||
(NAME trivial-features FILENAME trivial-features)
|
||||
(NAME trivial-garbage FILENAME trivial-garbage))
|
||||
DEPENDENCIES
|
||||
(alexandria babel cffi iterate trivial-features trivial-garbage) VERSION
|
||||
20210124-git SIBLINGS (cl-gobject-introspection-test) PARASITES NIL) */
|
|
@ -2,7 +2,7 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-postgres";
|
||||
version = "postmodern-20210124-git";
|
||||
version = "postmodern-20210411-git";
|
||||
|
||||
parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
|
||||
|
||||
|
@ -11,8 +11,8 @@ rec {
|
|||
deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz";
|
||||
sha256 = "1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc";
|
||||
url = "http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz";
|
||||
sha256 = "0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw";
|
||||
};
|
||||
|
||||
packageName = "cl-postgres";
|
||||
|
@ -21,9 +21,9 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
|
||||
SHA256 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL
|
||||
http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz
|
||||
MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME cl-postgres FILENAME cl-postgres
|
||||
SHA256 0q8izkkddmqq5sw55chkx6jrycawgchaknik5i84vynv50zirsbw URL
|
||||
http://beta.quicklisp.org/archive/postmodern/2021-04-11/postmodern-20210411-git.tgz
|
||||
MD5 8a75a05ba9e371f672f2620d40724cb2 NAME cl-postgres FILENAME cl-postgres
|
||||
DEPS
|
||||
((NAME alexandria FILENAME alexandria)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
|
@ -36,5 +36,5 @@ rec {
|
|||
DEPENDENCIES
|
||||
(alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5
|
||||
simple-date simple-date/postgres-glue split-sequence uax-15 usocket)
|
||||
VERSION postmodern-20210124-git SIBLINGS (postmodern s-sql simple-date)
|
||||
VERSION postmodern-20210411-git SIBLINGS (postmodern s-sql simple-date)
|
||||
PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-typesetting";
|
||||
version = "20210228-git";
|
||||
version = "20210411-git";
|
||||
|
||||
description = "Common Lisp Typesetting system";
|
||||
|
||||
deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz";
|
||||
sha256 = "13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp";
|
||||
url = "http://beta.quicklisp.org/archive/cl-typesetting/2021-04-11/cl-typesetting-20210411-git.tgz";
|
||||
sha256 = "1102n049hhg0kqnfvdfcisjq5l9yfvbw090nq0q8vd2bc688ng41";
|
||||
};
|
||||
|
||||
packageName = "cl-typesetting";
|
||||
|
@ -19,11 +19,11 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256
|
||||
13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp URL
|
||||
http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz
|
||||
MD5 949e7de37838d63f4c6b6e7dd88befeb NAME cl-typesetting FILENAME
|
||||
1102n049hhg0kqnfvdfcisjq5l9yfvbw090nq0q8vd2bc688ng41 URL
|
||||
http://beta.quicklisp.org/archive/cl-typesetting/2021-04-11/cl-typesetting-20210411-git.tgz
|
||||
MD5 f3fc7a47efb99cf849cb5eeede96dbaf NAME cl-typesetting FILENAME
|
||||
cl-typesetting DEPS
|
||||
((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate)
|
||||
(NAME zpb-ttf FILENAME zpb-ttf))
|
||||
DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210228-git SIBLINGS
|
||||
DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210411-git SIBLINGS
|
||||
(xml-render cl-pdf-doc) PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-webkit2";
|
||||
version = "cl-webkit-20210228-git";
|
||||
version = "cl-webkit-20210411-git";
|
||||
|
||||
description = "An FFI binding to WebKit2GTK+";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz";
|
||||
sha256 = "1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1";
|
||||
url = "http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz";
|
||||
sha256 = "10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh";
|
||||
};
|
||||
|
||||
packageName = "cl-webkit2";
|
||||
|
@ -19,9 +19,9 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256
|
||||
1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1 URL
|
||||
http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz
|
||||
MD5 49f38c18ac292122628356762270e5ff NAME cl-webkit2 FILENAME cl-webkit2
|
||||
10cky5v67s9mx2j96k0z01qbqfyc8w6a8byaamm7al5qkw997brh URL
|
||||
http://beta.quicklisp.org/archive/cl-webkit/2021-04-11/cl-webkit-20210411-git.tgz
|
||||
MD5 01b52f031fd8742ac9d422e4fcd2a225 NAME cl-webkit2 FILENAME cl-webkit2
|
||||
DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
|
@ -41,4 +41,4 @@ rec {
|
|||
cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib
|
||||
cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features
|
||||
trivial-garbage)
|
||||
VERSION cl-webkit-20210228-git SIBLINGS NIL PARASITES NIL) */
|
||||
VERSION cl-webkit-20210411-git SIBLINGS NIL PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl_plus_ssl";
|
||||
version = "cl+ssl-20210228-git";
|
||||
version = "cl+ssl-20210411-git";
|
||||
|
||||
description = "Common Lisp interface to OpenSSL.";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz";
|
||||
sha256 = "1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll";
|
||||
url = "http://beta.quicklisp.org/archive/cl+ssl/2021-04-11/cl+ssl-20210411-git.tgz";
|
||||
sha256 = "1rc13lc5wwzlkn7yhl3bwl6cmxxldmbfnz52nz5b83v4wlw2zbcw";
|
||||
};
|
||||
|
||||
packageName = "cl+ssl";
|
||||
|
@ -19,9 +19,9 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
|
||||
1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll URL
|
||||
http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz
|
||||
MD5 01b61fd8ee6ad8d3c1c695ba56d510b6 NAME cl+ssl FILENAME cl_plus_ssl DEPS
|
||||
1rc13lc5wwzlkn7yhl3bwl6cmxxldmbfnz52nz5b83v4wlw2zbcw URL
|
||||
http://beta.quicklisp.org/archive/cl+ssl/2021-04-11/cl+ssl-20210411-git.tgz
|
||||
MD5 9ef5b60ac4c8ad4f435a3ef6234897d0 NAME cl+ssl FILENAME cl_plus_ssl DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
(NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
|
||||
|
@ -33,4 +33,4 @@ rec {
|
|||
DEPENDENCIES
|
||||
(alexandria babel bordeaux-threads cffi flexi-streams split-sequence
|
||||
trivial-features trivial-garbage trivial-gray-streams uiop usocket)
|
||||
VERSION cl+ssl-20210228-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
|
||||
VERSION cl+ssl-20210411-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "clack-handler-hunchentoot";
|
||||
version = "clack-20191007-git";
|
||||
version = "clack-20210411-git";
|
||||
|
||||
description = "Clack handler for Hunchentoot.";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
|
||||
sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
|
||||
url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz";
|
||||
sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf";
|
||||
};
|
||||
|
||||
packageName = "clack-handler-hunchentoot";
|
||||
|
@ -19,9 +19,9 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
|
||||
SHA256 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
|
||||
http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
|
||||
MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-handler-hunchentoot
|
||||
SHA256 0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL
|
||||
http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz
|
||||
MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-handler-hunchentoot
|
||||
FILENAME clack-handler-hunchentoot DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
|
@ -43,7 +43,7 @@ rec {
|
|||
cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
|
||||
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
|
||||
usocket)
|
||||
VERSION clack-20191007-git SIBLINGS
|
||||
VERSION clack-20210411-git SIBLINGS
|
||||
(clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
|
||||
clack-test clack-v1-compat clack t-clack-handler-fcgi
|
||||
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "clack-socket";
|
||||
version = "clack-20191007-git";
|
||||
version = "clack-20210411-git";
|
||||
|
||||
description = "System lacks description";
|
||||
|
||||
deps = [ ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
|
||||
sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
|
||||
url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz";
|
||||
sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf";
|
||||
};
|
||||
|
||||
packageName = "clack-socket";
|
||||
|
@ -19,10 +19,10 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
|
||||
004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
|
||||
http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
|
||||
MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-socket FILENAME
|
||||
clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20191007-git SIBLINGS
|
||||
0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL
|
||||
http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz
|
||||
MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-socket FILENAME
|
||||
clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20210411-git SIBLINGS
|
||||
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
|
||||
clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
|
||||
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "clack-test";
|
||||
version = "clack-20191007-git";
|
||||
version = "clack-20210411-git";
|
||||
|
||||
description = "Testing Clack Applications.";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
|
||||
sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
|
||||
url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz";
|
||||
sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf";
|
||||
};
|
||||
|
||||
packageName = "clack-test";
|
||||
|
@ -19,9 +19,9 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
|
||||
004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
|
||||
http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
|
||||
MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-test FILENAME clack-test
|
||||
0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL
|
||||
http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz
|
||||
MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-test FILENAME clack-test
|
||||
DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
|
@ -68,7 +68,7 @@ rec {
|
|||
proc-parse quri rfc2388 rove smart-buffer split-sequence static-vectors
|
||||
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
|
||||
trivial-mimes trivial-types usocket xsubseq)
|
||||
VERSION clack-20191007-git SIBLINGS
|
||||
VERSION clack-20210411-git SIBLINGS
|
||||
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
|
||||
clack-handler-wookie clack-socket clack-v1-compat clack
|
||||
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "clack-v1-compat";
|
||||
version = "clack-20191007-git";
|
||||
version = "clack-20210411-git";
|
||||
|
||||
description = "System lacks description";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
|
||||
sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
|
||||
url = "http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz";
|
||||
sha256 = "0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf";
|
||||
};
|
||||
|
||||
packageName = "clack-v1-compat";
|
||||
|
@ -19,9 +19,9 @@ rec {
|
|||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
|
||||
004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
|
||||
http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
|
||||
MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-v1-compat FILENAME
|
||||
0yai9cx1gha684ljr8k1s5n4mi6mpj2wmvv6b9iw7pw1vhw5m8mf URL
|
||||
http://beta.quicklisp.org/archive/clack/2021-04-11/clack-20210411-git.tgz
|
||||
MD5 c47deb6287b72fc9033055914787f3a5 NAME clack-v1-compat FILENAME
|
||||
clack-v1-compat DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME bordeaux-threads FILENAME bordeaux-threads)
|
||||
|
@ -73,7 +73,7 @@ rec {
|
|||
split-sequence static-vectors trivial-backtrace trivial-features
|
||||
trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop
|
||||
usocket xsubseq)
|
||||
VERSION clack-20191007-git SIBLINGS
|
||||
VERSION clack-20210411-git SIBLINGS
|
||||
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
|
||||
clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
|
||||
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue