diff options
| -rw-r--r-- | overlays/package.nix | 41 | ||||
| -rw-r--r-- | repos/exwm/exwm.json | 1 | ||||
| -rw-r--r-- | repos/exwm/test.nix | 9 | ||||
| -rwxr-xr-x | repos/exwm/update | 27 | ||||
| -rw-r--r-- | repos/exwm/xelb.json | 1 |
5 files changed, 3 insertions, 76 deletions
diff --git a/overlays/package.nix b/overlays/package.nix index 0a07cf99a239..e4d8288fc700 100644 --- a/overlays/package.nix +++ b/overlays/package.nix @@ -1,30 +1,4 @@ self: super: -let - mkExDrv = emacsPackages: name: args: - let - repoMeta = super.lib.importJSON (../repos/exwm/. + "/${name}.json"); - in - emacsPackages.melpaBuild ( - args // { - pname = name; - ename = name; - version = repoMeta.version; - commit = repoMeta.rev; - - recipe = builtins.toFile "recipe" '' - (${name} :fetcher github - :repo "ch11ng/${name}") - ''; - - src = super.fetchFromGitHub { - owner = "ch11ng"; - repo = name; - inherit (repoMeta) rev sha256; - }; - } - ); - -in { emacsPackagesFor = emacs: ( (super.emacsPackagesFor emacs).overrideScope' ( @@ -46,21 +20,12 @@ in generated = ../repos/nongnu/nongnu-generated.nix; }; - epkgs = esuper.override { + in + esuper.override { inherit melpaStablePackages melpaPackages elpaPackages nongnuPackages; - }; + } - in - epkgs // { - xelb = mkExDrv eself "xelb" { - packageRequires = [ eself.cl-generic eself.emacs ]; - }; - - exwm = mkExDrv eself "exwm" { - packageRequires = [ eself.xelb ]; - }; - } ) ); diff --git a/repos/exwm/exwm.json b/repos/exwm/exwm.json deleted file mode 100644 index a5d3c3b42058..000000000000 --- a/repos/exwm/exwm.json +++ /dev/null @@ -1 +0,0 @@ -{"rev": "b62d5e79b0c1799f2cd941b4cec5bf8492cb322c", "sha256": "1i2as2i5vq8xmia36qajdz6z05g2mpz21p106d44az1h4b2jxz5j", "version": "20221122.0"} diff --git a/repos/exwm/test.nix b/repos/exwm/test.nix deleted file mode 100644 index 865476ebbcbc..000000000000 --- a/repos/exwm/test.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs ? import <nixpkgs> { overlays = [ (import ../../default.nix) ]; } }: - -let - package = pkgs.emacs; - emacsPackages = pkgs.emacsPackagesFor package; - emacsWithPackages = emacsPackages.emacsWithPackages; -in emacsWithPackages(epkgs: [ - epkgs.exwm -]) diff --git a/repos/exwm/update b/repos/exwm/update deleted file mode 100755 index 97971d6058e3..000000000000 --- a/repos/exwm/update +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl xmlstarlet nix coreutils -set -euxo pipefail - -SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" -cd $SCRIPTPATH - -function update_repo() { - owner=$1 - repo=$2 - echo $repo - - # Get relevant data (commit id and timestamp) for the latest commit - commit_data=$(curl "https://github.com/$owner/$repo/commits/master.atom" | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v "concat(atom:id,'/',atom:updated)" -n | head -n 1) - - # Extract commit sha and build a version number based on date: YYYYMMDD.0 - commit_sha=$(echo $commit_data | cut -d '/' -f 2) - version_number=$(echo $commit_data | cut -d '/' -f 3 | cut -d 'T' -f 1 | sed 's/-//g').0 - - digest=$(nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/${commit_sha}.tar.gz") - echo "{\"rev\": \"${commit_sha}\", \"sha256\": \"${digest}\", \"version\": \"${version_number}\"}" > $repo.json -} - -update_repo ch11ng exwm -update_repo ch11ng xelb - -nix-build --no-out-link --show-trace ./test.nix diff --git a/repos/exwm/xelb.json b/repos/exwm/xelb.json deleted file mode 100644 index 35fe0be49aed..000000000000 --- a/repos/exwm/xelb.json +++ /dev/null @@ -1 +0,0 @@ -{"rev": "df102a5773b37cec154e795a17a8513144dde643", "sha256": "10vlghs3610krmigszzainwjjrgdf66pxg6hd88lzicmki8gjypd", "version": "20200719.0"} |