Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e594af80c99f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 34bf218b16da
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Nov 4, 2018

  1. Add dhallPackages and add current Prelude 

    Dhall is a non-turing complete programming language.
    @Profpatsch
    Profpatsch committed Nov 4, 2018
    Copy the full SHA
    34bf218 View commit details
Showing with 40 additions and 0 deletions.
  1. +4 −0 .github/CODEOWNERS
  2. +9 −0 pkgs/development/dhall-modules/default.nix
  3. +25 −0 pkgs/development/dhall-modules/prelude/v3.nix
  4. +2 −0 pkgs/top-level/all-packages.nix
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
@@ -113,3 +113,7 @@
/nixos/modules/services/databases/postgresql.xml @thoughtpolice
/nixos/modules/services/databases/postgresql.nix @thoughtpolice
/nixos/tests/postgresql.nix @thoughtpolice

# Dhall
/pkgs/development/dhall-modules @Gabriel439 @Profpatsch
/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
9 changes: 9 additions & 0 deletions pkgs/development/dhall-modules/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{ pkgs }:

# TODO: add into the toplevel fixpoint instead of using rec
rec {

prelude = prelude_3_0_0;
prelude_3_0_0 = pkgs.callPackage ./prelude/v3.nix {};

}
25 changes: 25 additions & 0 deletions pkgs/development/dhall-modules/prelude/v3.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, lib, fetchFromGitHub }:

stdenv.mkDerivation {
name = "dhall-prelude";

src = fetchFromGitHub {
owner = "dhall-lang";
repo = "dhall-lang";
# Commit where the v3.0.0 prelude folder was merged into dhall-lang
# and a LICENSE file has been added.
rev = "f6aa9399f1ac831d66c34104abe6856023c5b2df";
sha256 = "0kqjgh3y1l3cb3rj381j7c09547g1vh2dsfzpm08y1qajhhf9vgf";
};

phases = [ "unpackPhase" "installPhase" ];

installPhase = ''
cp -r Prelude $out
'';

meta = {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ Profpatsch ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7549,6 +7549,8 @@ with pkgs;

dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;

dhallPackages = import ../development/dhall-modules { inherit pkgs; };

duktape = callPackage ../development/interpreters/duktape { };

beam = callPackage ./beam-packages.nix { };