Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Nixpkgs to the latest nixpkgs-unstable #2573

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into gabriella/upgrade_nixpkgs_2
  • Loading branch information
Gabriella439 authored Oct 6, 2024
commit 361019cd60daa092764988c281db1afcc786f6f6
8 changes: 4 additions & 4 deletions dhall-lsp-server/dhall-lsp-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ library
, directory >= 1.2.2.0 && < 1.4
, dhall >= 1.38.0 && < 1.43
, dhall-json >= 1.4 && < 1.8
, filepath >= 1.4.2 && < 1.5
, filepath >= 1.4.2 && < 1.6
, lsp >= 2.1.0.0 && < 2.4
, lens >= 4.16.1 && < 5.3
, lens >= 4.16.1 && < 5.4
-- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
, megaparsec >= 7.0.2 && < 10
, mtl >= 2.2.2 && < 2.4
Expand Down Expand Up @@ -105,9 +105,9 @@ Test-Suite tests
Build-Depends:
base ,
lsp-types >= 2.0.1 && < 2.2 ,
hspec >= 2.7 && < 2.11 ,
hspec >= 2.7 && < 2.12 ,
lsp-test >= 0.15.0.0 && < 0.17 ,
tasty >= 0.11.2 && < 1.5 ,
tasty >= 0.11.2 && < 1.6 ,
tasty-hspec >= 1.1 && < 1.3 ,
text >= 0.11 && < 2.2
Build-Tool-Depends: dhall-lsp-server:dhall-lsp-server
Expand Down
4 changes: 1 addition & 3 deletions dhall-nixpkgs/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,7 @@ directoryToNixpkgs Directory{ name, directory, file, source, document, fixedOutp

expression <- Dhall.Core.throws (Dhall.Parser.exprFromText expressionFile expressionText)

let status = Dhall.Import.emptyStatus dir
where
dir = Turtle.directory expressionFile
let status = Dhall.Import.emptyStatus (Turtle.directory expressionFile)

dependencies <- Turtle.reduce Foldl.nub (State.evalStateT (findExternalDependencies expression) status)

Expand Down
4 changes: 2 additions & 2 deletions dhall-nixpkgs/dhall-nixpkgs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Executable dhall-to-nixpkgs
, neat-interpolation < 0.6
, optparse-applicative >= 0.14.0.0 && < 0.19
, prettyprinter >= 1.7.0 && < 1.8
, text >= 0.11.1.0 && < 2.1
, transformers >= 0.2.0.0 && < 0.6
, text >= 0.11.1.0 && < 2.2
, transformers >= 0.2.0.0 && < 0.7
, turtle >= 1.6 && < 1.7
, network-uri < 2.8
Default-Language: Haskell2010
Expand Down
1 change: 1 addition & 0 deletions dhall/src/Dhall/Syntax/Chunks.hs-boot
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{-# LANGUAGE NoPolyKinds #-}
{-# LANGUAGE StandaloneKindSignatures #-}

module Dhall.Syntax.Chunks where

Expand Down
1 change: 1 addition & 0 deletions dhall/src/Dhall/Syntax/Types.hs-boot
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{-# LANGUAGE NoPolyKinds #-}
{-# LANGUAGE StandaloneKindSignatures #-}

module Dhall.Syntax.Types where

Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.