This commit is contained in:
Andrea Ciceri 2023-02-13 00:12:21 +01:00
parent ed5af68f51
commit 0487fc1dd3
No known key found for this signature in database
GPG key ID: A1FC89532D1C5654
3 changed files with 15 additions and 25 deletions

34
flake.lock generated
View file

@ -22,17 +22,18 @@
"emacs-src": { "emacs-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1676205563, "lastModified": 1676224660,
"narHash": "sha256-anRfug+WyfWr0HRhdmo65Z1Ey15BrtJzJEMPsuwCVsY=", "narHash": "sha256-9CkPx2CHhrwLoDerjMgYnFxeTC3f8IBf8F9rxVldxe0=",
"ref": "refs/heads/master", "ref": "emacs-29",
"rev": "ac2c7a28da0b1bbed0fc92723c041b739b821977", "rev": "eb2b0931cf1258b875b031f81a3685eda8ddf5cb",
"revCount": 164935, "revCount": 164478,
"type": "git", "type": "git",
"url": "git://git.savannah.gnu.org/emacs.git?branch=emacs29" "url": "git://git.savannah.gnu.org/emacs.git"
}, },
"original": { "original": {
"ref": "emacs-29",
"type": "git", "type": "git",
"url": "git://git.savannah.gnu.org/emacs.git?branch=emacs29" "url": "git://git.savannah.gnu.org/emacs.git"
} }
}, },
"flake-parts": { "flake-parts": {
@ -102,26 +103,15 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1670498129,
"narHash": "sha256-QOWbsKObHxNpBzrIVJrgR2TGQdwyYNFgBdoVCCvYuDU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52665b05cfd702e12b877aa519b62374d003231a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": { "root": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"emacs-src": "emacs-src", "emacs-src": "emacs-src",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2" "nixpkgs": [
"emacs-overlay",
"nixpkgs"
]
} }
} }
}, },

View file

@ -5,10 +5,10 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
emacs-overlay.url = "github:nix-community/emacs-overlay"; emacs-overlay.url = "github:nix-community/emacs-overlay";
emacs-src = { emacs-src = {
url = "git://git.savannah.gnu.org/emacs.git?branch=emacs29"; url = "git://git.savannah.gnu.org/emacs.git?ref=emacs-29";
flake = false; flake = false;
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
nixpkgs.follows = "emacs-overlay/nixpkgs";
}; };
outputs = inputs @ { outputs = inputs @ {

View file

@ -22,7 +22,7 @@
.overrideAttrs (_: { .overrideAttrs (_: {
name = "ccr-emacs-${inputs.emacs-src.rev}"; name = "ccr-emacs-${inputs.emacs-src.rev}";
src = inputs.emacs-src.outPath; src = inputs.emacs-src.outPath;
version = inputs.emacs-src.rev; version = "29";
}); });
ccrEmacs = ccrEmacs =
(emacsPackagesFor self'.packages.ccrEmacsWithoutPackages).emacsWithPackages (emacsPackagesFor self'.packages.ccrEmacsWithoutPackages).emacsWithPackages