From 868bcb0708ec58ab2046cd127e45a7c41644b337 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 24 Aug 2021 18:35:09 -0700 Subject: [PATCH] v0.3.0 --- flake.lock | 36 +++++++++++++++---------------- flake.nix | 4 +++- nixpkgs-update.cabal | 51 ++++++++++++++++++++++++++++++++++---------- package.yaml | 11 +++++++++- 4 files changed, 71 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 9f41a41..a44c826 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1600853454, - "narHash": "sha256-EgsgbcJNZ9AQLVhjhfiegGjLbO+StBY9hfKsCwc8Hw8=", + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "owner": "edolstra", "repo": "flake-compat", - "rev": "94cf59784c73ecec461eaa291918eff0bfb538ac", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1601282935, - "narHash": "sha256-WQAFV6sGGQxrRs3a+/Yj9xUYvhTpukQJIcMbIi7LCJ4=", + "lastModified": 1629481132, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "588973065fce51f4763287f0fda87a174d78bf48", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", "type": "github" }, "original": { @@ -33,11 +33,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1600209923, - "narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=", + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", "type": "github" }, "original": { @@ -48,11 +48,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1607777752, - "narHash": "sha256-PDJazqvYa4dKXD6GuEOzdWi89SOb0PsXBfm/ljkehgA=", + "lastModified": 1629853352, + "narHash": "sha256-NivLQ6qGhQxTYqinZ3r2hA01WcHRhhaS9VFXPYwJ07w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da89a252ca1e8b8f2003582c9e0577d41f3a226a", + "rev": "0cc67d775fba1af56eea9420c81e524f94376564", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1607754552, - "narHash": "sha256-Grn2h6PZ0ISITy9yrAkwfqwDOk6G3hOZFVHDphIZuD4=", + "lastModified": 1629814514, + "narHash": "sha256-iBNBw+gh6CiXyeaTfm46g7DxYQ3fLKyHcPWHPxF5Xfc=", "owner": "mic92", "repo": "nixpkgs-review", - "rev": "2545b8b35d5eeb09a0615ad677fdbcb1a7cb73c5", + "rev": "561ba2fff1993d5b71c12f90a5090507bfadf25e", "type": "github" }, "original": { @@ -82,11 +82,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1607744299, - "narHash": "sha256-Mzc1Z/b1IpoU4p/AWbOZMM8n8JJ5Yna3SQApTYDqh+8=", + "lastModified": 1613848021, + "narHash": "sha256-9JICogf6yTscjE3bmeX13vks+omv8408I3B7gWIau5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8f26afbbf45fa28fd024bcbfc06a097aca0ea1c", + "rev": "1c5ca28030c459fc10d69b8608c66ed3a45f8fe9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95a9e4c..2adcfaf 100644 --- a/flake.nix +++ b/flake.nix @@ -29,8 +29,10 @@ NIXPKGSREVIEW = (import nixpkgs-review { inherit pkgs; }); }; - haskellPackages = pkgs.haskell.packages.ghc8102.override { + haskellPackages = pkgs.haskellPackages.override { overrides = _: haskellPackages: { + polysemy-plugin = pkgs.haskell.lib.dontCheck haskellPackages.polysemy-plugin; + polysemy = pkgs.haskell.lib.dontCheck haskellPackages.polysemy; nixpkgs-update = pkgs.haskell.lib.justStaticExecutables ( pkgs.haskell.lib.failOnAllWarnings ( diff --git a/nixpkgs-update.cabal b/nixpkgs-update.cabal index 2bf1843..6bb6c90 100644 --- a/nixpkgs-update.cabal +++ b/nixpkgs-update.cabal @@ -1,13 +1,13 @@ cabal-version: 2.2 --- This file has been generated from package.yaml by hpack version 0.33.0. +-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack -- --- hash: 58424b4f6d939fb54c291e341863d658ea2403d27b8caaa422662f6d428ea62a +-- hash: 6778c17aab195efecb532625c1155500d873a35ed7db9bd27fe86cb841a65bd4 name: nixpkgs-update -version: 0.2.0 +version: 0.3.0 synopsis: Tool for semi-automatic updating of nixpkgs repository description: nixpkgs-update provides tools for updating of nixpkgs packages in a semi-automatic way. Mainly, it is used to run the GitHub bot @r-ryantm, but the underlying update mechanisms should be generally useful and in a later version should be exposed as a command-line tool. category: Web @@ -49,11 +49,20 @@ library Update Utils Version - other-modules: - Paths_nixpkgs_update hs-source-dirs: src - default-extensions: DataKinds FlexibleContexts GADTs LambdaCase PolyKinds RankNTypes ScopedTypeVariables TypeApplications TypeFamilies TypeOperators BlockArguments + default-extensions: + DataKinds + FlexibleContexts + GADTs + LambdaCase + PolyKinds + RankNTypes + ScopedTypeVariables + TypeApplications + TypeFamilies + TypeOperators + BlockArguments ghc-options: -Wall -O2 -flate-specialise -fspecialise-aggressively -fplugin=Polysemy.Plugin build-depends: aeson @@ -101,11 +110,20 @@ library executable nixpkgs-update main-is: Main.hs - other-modules: - Paths_nixpkgs_update hs-source-dirs: app - default-extensions: DataKinds FlexibleContexts GADTs LambdaCase PolyKinds RankNTypes ScopedTypeVariables TypeApplications TypeFamilies TypeOperators BlockArguments + default-extensions: + DataKinds + FlexibleContexts + GADTs + LambdaCase + PolyKinds + RankNTypes + ScopedTypeVariables + TypeApplications + TypeFamilies + TypeOperators + BlockArguments ghc-options: -Wall -O2 -flate-specialise -fspecialise-aggressively -fplugin=Polysemy.Plugin build-depends: aeson @@ -156,14 +174,25 @@ test-suite spec type: exitcode-stdio-1.0 main-is: Spec.hs other-modules: + CheckSpec DoctestSpec RewriteSpec UpdateSpec UtilsSpec - Paths_nixpkgs_update hs-source-dirs: test - default-extensions: DataKinds FlexibleContexts GADTs LambdaCase PolyKinds RankNTypes ScopedTypeVariables TypeApplications TypeFamilies TypeOperators BlockArguments + default-extensions: + DataKinds + FlexibleContexts + GADTs + LambdaCase + PolyKinds + RankNTypes + ScopedTypeVariables + TypeApplications + TypeFamilies + TypeOperators + BlockArguments ghc-options: -Wall -O2 -flate-specialise -fspecialise-aggressively -fplugin=Polysemy.Plugin build-depends: aeson diff --git a/package.yaml b/package.yaml index 4c7ed04..9cefd02 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: nixpkgs-update -version: 0.2.0 +version: 0.3.0 synopsis: Tool for semi-automatic updating of nixpkgs repository description: nixpkgs-update provides tools for updating of nixpkgs packages in a semi-automatic way. Mainly, it is used to run the GitHub @@ -76,6 +76,9 @@ dependencies: library: source-dirs: src + when: + - condition: false + other-modules: Paths_nixpkgs_update tests: spec: @@ -87,6 +90,9 @@ tests: - hspec-discover - nixpkgs-update - doctest + when: + - condition: false + other-modules: Paths_nixpkgs_update executables: nixpkgs-update: @@ -94,3 +100,6 @@ executables: main: Main.hs dependencies: - nixpkgs-update + when: + - condition: false + other-modules: Paths_nixpkgs_update