itsycal: init at 0.15.3 #299294
itsycal: init at 0.15.3 #299294
Conversation
ofborg
bot
added
10.rebuild-darwin: 0
|
The eval bug was fixed in #299288 |
| pname = "itsycal"; | ||
| version = "0.15.3"; | ||
|
|
||
| src = fetchurl { |
There was a problem hiding this comment.
Any specific reason why fetchurl used but not fetchzip?
There was a problem hiding this comment.
Nope, I didn't realize there was fetchzip will change it
There was a problem hiding this comment.
On a second note maybe not... fetchzip is getting different hash and it seems like it's not downloading stuff properly either?
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/ryja8i37q8kci47blxdcmjr6sm51lr9k-source
source root is .
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
@nix { "action": "setPhase", "phase": "updateAutotoolsGnuConfigScriptsPhase" }
updateAutotoolsGnuConfigScriptsPhase
@nix { "action": "setPhase", "phase": "configurePhase" }
configuring
no configure script, doing nothing
@nix { "action": "setPhase", "phase": "buildPhase" }
building
no Makefile or custom buildPhase, doing nothing
@nix { "action": "setPhase", "phase": "installPhase" }
installing
total 12
-rw-r--r-- 1 _nixbld1 nixbld 158 Mar 26 21:58 .sandbox.sb
-rw-r--r-- 1 _nixbld1 nixbld 5104 Mar 26 21:58 env-vars
drwxr-xr-x 3 _nixbld1 nixbld 96 Jan 1 1970 source
mv: cannot stat 'Itsycal.app': No such file or directoryI suggest it stays fetchurl unless fetchzip requires extra stuff I'm not aware of that would fix this? 🤔
The diff for the output above:
diff --git a/pkgs/os-specific/darwin/itsycal/default.nix b/pkgs/os-specific/darwin/itsycal/default.nix
index 4ce7d3ae084f..85c07d6eeb9d 100644
--- a/pkgs/os-specific/darwin/itsycal/default.nix
+++ b/pkgs/os-specific/darwin/itsycal/default.nix
@@ -1,5 +1,5 @@
{ lib
-, fetchurl
+, fetchzip
, stdenvNoCC
, unzip
}:
@@ -8,9 +8,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "itsycal";
version = "0.15.3";
- src = fetchurl {
+ src = fetchzip {
url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
- hash = "sha256-5aJzSuqq31B33jW4lV8vuU3eurpZBoyIW/AOC9/pxng=";
+ hash = "sha256-jpTlJY7yAARrkHzreQKbFaKj0sYp950R0qPPcDeY6AE=";
};
sourceRoot = ".";
@@ -20,6 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
+ ls -lA
mkdir -p $out/Applications
mv Itsycal.app $out/ApplicationsThere was a problem hiding this comment.
This worked for me (haven't tested the app tho):
diff --git a/pkgs/os-specific/darwin/itsycal/default.nix b/pkgs/os-specific/darwin/itsycal/default.nix
index 4ce7d3ae084f..8d727e703650 100644
--- a/pkgs/os-specific/darwin/itsycal/default.nix
+++ b/pkgs/os-specific/darwin/itsycal/default.nix
@@ -1,5 +1,5 @@
{ lib
-, fetchurl
+, fetchzip
, stdenvNoCC
, unzip
}:
@@ -8,20 +8,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pname = "itsycal";
version = "0.15.3";
- src = fetchurl {
+ src = fetchzip {
url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
- hash = "sha256-5aJzSuqq31B33jW4lV8vuU3eurpZBoyIW/AOC9/pxng=";
+ hash = "sha256-jpTlJY7yAARrkHzreQKbFaKj0sYp950R0qPPcDeY6AE=";
};
- sourceRoot = ".";
-
- nativeBuildInputs = [ unzip ];
-
installPhase = ''
runHook preInstall
- mkdir -p $out/Applications
- mv Itsycal.app $out/Applications
+ mkdir -p $out/Applications/Itsycal.app
+ cp -R . $out/Applications/Itsycal.app
runHook postInstall
'';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c014c268962a..973238d5c8e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38276,6 +38276,8 @@ with pkgs;
itsx = callPackage ../applications/science/biology/itsx { };
+ itsycal = callPackage ../os-specific/darwin/itsycal { };
+
iv = callPackage ../applications/science/biology/iv {
neuron-version = neuron.version;
};There was a problem hiding this comment.
I guess the problem was due to
sourceRoot = ".";(wrong location?)mv Itsycal.app $out/Applications(nix store is read-only).
There was a problem hiding this comment.
Thanks for the help!
Oh, nice I thought I did something wrong glad it was fix this fast as well! I guess you could ping OfBerg to eval it again, good to know for the future! |
DontEatOreo
force-pushed
the
pkgs-itsycal
branch
from
9f7c1a8 to
19f8e04
Compare
|
Seems like you'll have to migrate to
|
|
Sounds good, let's keep it as is. Btw, seems like the package introduced in #299032 doesn't have an entry in |
I'm not sure what you mean here? Do you want me to move over to
That's what I was saying, because if it had an entry, then it would have to be moved to I see some other packages like |
| description = "Itsycal is a tiny menu bar calendar"; | ||
| homepage = "https://www.mowglii.com/itsycal/"; | ||
| license = lib.licenses.mit; | ||
| maintainers = with lib.maintainers; [ DontEatOreo ]; |
There was a problem hiding this comment.
$ nix run nixpkgs#nixpkgs-review -- pr --print-result 299294
...
error: undefined variable 'DontEatOreo'
at /Users/ysun/.cache/nixpkgs-review/pr-299294/nixpkgs/pkgs/os-specific/darwin/itsycal/default.nix:29:43:
28| license = lib.licenses.mit;
29| maintainers = with lib.maintainers; [ DontEatOreo ];Please add an entry to https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix and backport it to your earliest contribution in nixpkgs where lib.maintainers.DontEatOreo is referenced.
I think it'd better if we involve a nixpkgs committer to see how we can resolve this, since #299032 was merged without lib.maintainers.DontEatOreo being defined.
Relevant: https://github.com/NixOS/nixpkgs/tree/master/maintainers
There was a problem hiding this comment.
I'm already there
nixpkgs/maintainers/maintainer-list.nix
Lines 5119 to 5126 in aa1257d
I guess it was a bit stupid of me, but didn't realize it was case-sensitive
There was a problem hiding this comment.
Ah, nice! I guess we would need a new PR to have the package introduced in #299032 to reference the correct maintainer (correct casing), and backport it
There was a problem hiding this comment.
Thanks for letting me know !
Sorry about my wording. Please keep The only thing we need now is to add your maintainer metadata to |
i thought that new packages all go under |
That was my understanding too. I’d expect packages in |
I think it'd be better to keep If the consensus here is to init |
package guidelines are pretty clear where new apps are. let's keep this area clean. also install-binary-package is not clear it belongs here either. |
|
another benefit is being able to take advantage of the merge-bot in |
DontEatOreo
force-pushed
the
pkgs-itsycal
branch
from
19f8e04 to
9277a8a
Compare
|
I guess I don't need to define
|
DontEatOreo
force-pushed
the
pkgs-itsycal
branch
from
9277a8a to
574f0d2
Compare
ofborg
bot
added
8.has: package (new)
|
Result of 1 package built:
|
ghost
merged commit 
|
Successfully created backport PR for |
Description of changes
Continuation of #299257
I'm really sorry I had to open a new issue, but OfBorg gave errors for a build that works perfectly fine.
OfBorg log: https://gist.github.com/GrahamcOfBorg/bfaae351d6dc61a08283686ab23a0e80
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.