~jack/misc

b7d53c6797b473c7689f8ddcff15ca9e7f8c9405 — Jack Kelly 4 months ago 792d1a6
Nixpkgs bump
M bunkplan/bunkplan.cabal => bunkplan/bunkplan.cabal +1 -1
@@ 15,7 15,7 @@ extra-source-files:  CHANGELOG.md

executable bunkplan
  main-is:             Bunkplan.hs
  build-depends:       base >= 4.12 && < 4.14
  build-depends:       base >= 4.12 && < 4.15
                     , containers >= 0.6.0.1 && < 0.7
                     , csv >= 0.1.2 && < 0.2
                     , filepath >= 1.4.2.1 && < 1.5

M bunkplan/bunkplan.nix => bunkplan/bunkplan.nix +2 -3
@@ 1,5 1,4 @@
{ mkDerivation, base, containers, csv, filepath, html, parsec
, stdenv
{ mkDerivation, base, containers, csv, filepath, html, lib, parsec
}:
mkDerivation {
  pname = "bunkplan";


@@ 11,5 10,5 @@ mkDerivation {
    base containers csv filepath html parsec
  ];
  description = "Generate a HTML bunkplan from a CSV";
  license = stdenv.lib.licenses.agpl3Plus;
  license = lib.licenses.agpl3Plus;
}

M cabinsheets/cabinsheets.cabal => cabinsheets/cabinsheets.cabal +1 -1
@@ 15,7 15,7 @@ extra-source-files:  CHANGELOG.md, README

executable cabinsheets
  main-is:             Cabinsheets.hs
  build-depends:       base >= 4.12 && < 4.14
  build-depends:       base >= 4.12 && < 4.15
                     , containers >= 0.6.0.1 && < 0.7
                     , csv >= 0.1.2 && < 0.2
                     , filepath >= 1.4.2.1 && < 1.5

M cabinsheets/cabinsheets.nix => cabinsheets/cabinsheets.nix +2 -3
@@ 1,5 1,4 @@
{ mkDerivation, base, containers, csv, filepath, html, parsec
, stdenv
{ mkDerivation, base, containers, csv, filepath, html, lib, parsec
}:
mkDerivation {
  pname = "cabinsheets";


@@ 11,5 10,5 @@ mkDerivation {
    base containers csv filepath html parsec
  ];
  description = "Generate cabin sheets from a CSV";
  license = stdenv.lib.licenses.agpl3Plus;
  license = lib.licenses.agpl3Plus;
}

M codeworld-raycaster/codeworld-raycaster.cabal => codeworld-raycaster/codeworld-raycaster.cabal +1 -1
@@ 19,7 19,7 @@ library
                     , State
  build-depends:       base >= 4.10 && < 5
                     , array >= 0.5.2.0 && < 0.6
                     , codeworld-api >= 0.3 && < 0.5
                     , codeworld-api >= 0.3 && < 0.8
                     , text >= 1.2.2.2 && < 1.3
  hs-source-dirs:      src
  default-language:    Haskell2010

M codeworld-raycaster/codeworld-raycaster.nix => codeworld-raycaster/codeworld-raycaster.nix +2 -2
@@ 1,4 1,4 @@
{ mkDerivation, array, base, codeworld-api, stdenv, text }:
{ mkDerivation, array, base, codeworld-api, lib, text }:
mkDerivation {
  pname = "codeworld-raycaster";
  version = "0.1.0.0";


@@ 9,5 9,5 @@ mkDerivation {
  executableHaskellDepends = [ base codeworld-api ];
  homepage = "https://git.sr.ht/~jack/misc";
  description = "Simple raycaster";
  license = stdenv.lib.licenses.agpl3Plus;
  license = lib.licenses.agpl3Plus;
}

M codeworld-raycaster/default.nix => codeworld-raycaster/default.nix +10 -9
@@ 1,5 1,5 @@
{ nixpkgs ? import ../nix/nixpkgs.nix
, compiler ? "ghc865"
, compiler ? "default"
, doBenchmark ? false
}:



@@ 13,14 13,15 @@ let
  myHaskellPackages = haskellPackages.override {
    overrides = self: super: with pkgs.haskell.lib; {
      codeworld-api = doJailbreak (unmarkBroken super.codeworld-api);
      patch = doJailbreak (dontCheck (unmarkBroken super.patch));
      reflex = doJailbreak (unmarkBroken super.reflex);

      blank-canvas =
        dontCheck (doJailbreak (super.callHackage "blank-canvas" "0.6.3" {}));
      colour = dontCheck (super.callHackage "colour" "2.3.4" {});
      dependent-map = super.callHackage "dependent-map" "0.3.1.0" {};
      dependent-sum = super.callHackage "dependent-sum" "0.6.1" {};
#      codeworld-api = doJailbreak (unmarkBroken super.codeworld-api);
#      patch = doJailbreak (dontCheck (unmarkBroken super.patch));
#      reflex = doJailbreak (unmarkBroken super.reflex);
#
#      blank-canvas =
#        dontCheck (doJailbreak (super.callHackage "blank-canvas" "0.6.3" {}));
#      colour = dontCheck (super.callHackage "colour" "2.3.4" {});
#      dependent-map = super.callHackage "dependent-map" "0.3.1.0" {};
#      dependent-sum = super.callHackage "dependent-sum" "0.6.1" {};
    };
  };


M codeworld-raycaster/shell.nix => codeworld-raycaster/shell.nix +1 -1
@@ 1,5 1,5 @@
{ nixpkgs ? import ../nix/nixpkgs.nix
, compiler ? "ghc865"
, compiler ? "default"
, doBenchmark ? false
}:
let

M default.nix => default.nix +1 -1
@@ 4,7 4,7 @@ let
  bunkplan-ml = import ./bunkplan-ml { inherit nixpkgs; };
  cabinsheets = import ./cabinsheets { inherit nixpkgs; };
  codeworld-raycaster = import ./codeworld-raycaster { inherit nixpkgs; };
  ergodox = import ./ergodox { inherit nixpkgs; };
  ergodox = import ./ergodox;
  lambda-c = import ./lambda-c { inherit nixpkgs; };
  metscrape = import ./metscrape { inherit nixpkgs; };
  metscrape2 = import ./metscrape2 { inherit nixpkgs; };

M ergodox/default.nix => ergodox/default.nix +14 -2
@@ 1,6 1,18 @@
{ nixpkgs ? import ../nix/nixpkgs.nix }:
let
  inherit (nixpkgs) pkgs;
  # We don't use the repo's nixpkgs pin:
  #
  # 1. newer nixpkgs pull in a gcc that causes linker errors which I
  #    don't want to debug
  #
  # 2. newer keyboard firmware has bugs on the Infinity Ergodox that
  #    the maintainer doesn't know how to fix.
  #
  # 3. Keeping up with the latest versions of everything doesn't really
  #    matter if the firmware works right on the keyboard.
  pkgs = import (builtins.fetchTarball {
    url = "https://github.com/nixos/nixpkgs/archive/eda60c51a9e6553631f01053bc05d9c914936249.tar.gz";
    sha256 = "1a26y3r5wcwv5h203jz6j7qsks2qq9s27hk50nl14mjh1abbxyk9";
  }) { };

  controller = pkgs.fetchFromGitHub {
    owner = "kiibohd";

M metscrape2/metscrape.cabal => metscrape2/metscrape.cabal +1 -1
@@ 13,7 13,7 @@ Build-Type:             Simple
Homepage:               https://git.sr.ht/~jack/misc

Library
  Build-Depends:        base >= 4.12.0.0 && < 4.14,
  Build-Depends:        base >= 4.12.0.0 && < 4.15,
                        bytestring >= 0.10.8.2 && < 0.11,
                        containers >= 0.6.0.1 && < 0.7,
                        directory >= 1.3.3.0 && < 1.4,

M metscrape2/metscrape.nix => metscrape2/metscrape.nix +2 -2
@@ 1,5 1,5 @@
{ mkDerivation, base, bytestring, containers, directory, filepath
, HTTP, hxt, hxt-http, network, network-uri, stdenv
, HTTP, hxt, hxt-http, lib, network, network-uri
}:
mkDerivation {
  pname = "metscrape";


@@ 14,5 14,5 @@ mkDerivation {
  executableHaskellDepends = [ base ];
  homepage = "https://git.sr.ht/~jack/misc";
  description = "Batch-download marine weather forecasts";
  license = stdenv.lib.licenses.agpl3Plus;
  license = lib.licenses.agpl3Plus;
}

M nix/nixpkgs.json => nix/nixpkgs.json +7 -4
@@ 1,7 1,10 @@
{
  "url": "https://github.com/NixOS/nixpkgs",
  "rev": "eda60c51a9e6553631f01053bc05d9c914936249",
  "date": "2020-03-28T23:29:57-04:00",
  "sha256": "1a26y3r5wcwv5h203jz6j7qsks2qq9s27hk50nl14mjh1abbxyk9",
  "fetchSubmodules": false
  "rev": "57ad08a00652a5d6ee2bdf87352e58b8824e7dce",
  "date": "2021-08-01T22:52:23+00:00",
  "path": "/nix/store/q6ri8gw4p62pd7rirjl7m9ih1s79q60w-nixpkgs",
  "sha256": "0brjfbhdiz1khdfmq6n5q40gyx17zkc3qdak98mdnzaqg1xicgra",
  "fetchSubmodules": false,
  "deepClone": false,
  "leaveDotGit": false
}

M stg/default.nix => stg/default.nix +1 -1
@@ 1,5 1,5 @@
{ nixpkgs ? import ../nix/nixpkgs.nix
, compiler ? "ghc883"
, compiler ? "default"
, doBenchmark ? false
}:


M stg/stg.cabal => stg/stg.cabal +6 -4
@@ 16,21 16,23 @@ extra-source-files: CHANGELOG.md

library
  build-depends:
    , base         ^>=4.13
    , base         ^>=4.14
    , bytestring   ^>=0.10.10.0
    , containers   ^>=0.6.2.1
    , language-c   ^>=0.8.3
    , lens         ^>=4.18.1
    , language-c   ^>=0.9.0.1
    , lens         ^>=4.19.2
    , pretty-show  ^>=1.10
    , relude       ^>=0.6.0.0
    , relude       ^>=0.7.0.0

  ghc-options:        -Wall
  hs-source-dirs:     src
  default-extensions: NoImplicitPrelude
  default-language:   Haskell2010
  exposed-modules:
    Language.Core
    Language.STG
    Language.STG.AST
    Language.STG.Compile
    Language.STG.EAMachine
    Language.STG.Eval
    Language.STG.EvalApplyAST

M stg/stg.nix => stg/stg.nix +3 -3
@@ 1,5 1,5 @@
{ mkDerivation, base, bytestring, containers, language-c, lens
, pretty-show, relude, stdenv
{ mkDerivation, base, bytestring, containers, language-c, lens, lib
, pretty-show, relude
}:
mkDerivation {
  pname = "stg";


@@ 9,5 9,5 @@ mkDerivation {
    base bytestring containers language-c lens pretty-show relude
  ];
  description = "Exploring the STG";
  license = stdenv.lib.licenses.agpl3Plus;
  license = lib.licenses.agpl3Plus;
}