1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 09:31:01 +00:00
Commit graph

1094 commits

Author SHA1 Message Date
Matthias Beyer 31bee0cc7c
wordgrinder: Fix build
First I tried to fix the build like this:

> This fixes the build of the wordgrinder package by disabling the build
> of "xwordgrinder", the non-curses frontend of wordgrinder.
>
> For re-enabling the build, this patch shall be reverted and then go on
> from there.
>
> I opted for disabling the x frontend of this program because the whole
> purpose of this is to use a curses writing program (at least for me).
> It seems that hacking around the new build system in nixpkgs is a
> non-trivial task and I wanted to get this package out of the door as
> fast as possible because I already delayed the fix by a few days (or is
> it weeks already), so this is the simple fix.
>
> If someone wants to have the X frontend again, I can invest more time at
> some point.

But then the almighty aszlig came around and told me how to do it right. So here
we go, with a patch from me that is acutally from aszlig (see #60122).

This fixes the build.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: aszlig <aszlig@nix.build>
Fixes: 6b2bd330fa ("wordgrinder: Fix sha256 hash")
Fixes: 19a3abc1b8 ("wordgrinder: 0.7.1 -> 0.7.2")
Merges: https://github.com/NixOS/nixpkgs/pull/60122
Cc: @devhell
2019-04-26 09:05:05 +02:00
Will Dietz 6e4fa85446
Merge pull request #56259 from dtzWill/feature/minetime
minetime: init at 1.4.12
2019-04-25 23:22:30 -05:00
Renaud 7c5cb3e99f
Merge pull request #59445 from r-ryantm/auto-update/atlassian-cli
atlassian-cli: 8.0.0 -> 8.2.0
2019-04-24 21:54:44 +02:00
Will Dietz fc6c5fdfed minetime: 1.4.12 -> 1.5.1, better entrypoint name, drop unused 32bit
https://github.com/marcoancona/MineTime/releases/tag/v1.5.1
https://github.com/marcoancona/MineTime/releases/tag/v1.5.0
2019-04-23 20:43:04 -05:00
Will Dietz 9db228d506 minetime: 1.4.11 -> 1.4.12 2019-04-23 20:40:54 -05:00
Will Dietz a7065d315d minetime: 1.4.10 -> 1.4.11
https://github.com/marcoancona/MineTime/releases/tag/v1.4.11
2019-04-23 20:40:54 -05:00
Will Dietz 25fb5d553c minetime: init at 1.4.10, using appimageTools 2019-04-23 20:40:53 -05:00
Will Dietz 9f50259ea6 trilium: 0.30.6 -> 0.30.8
https://github.com/zadam/trilium/releases/tag/v0.30.8
https://github.com/zadam/trilium/releases/tag/v0.30.7
2019-04-22 15:23:08 -05:00
Aaron Andersen 8c881a1bb5
Merge pull request #59521 from r-ryantm/auto-update/gnucash
gnucash: 3.4 -> 3.5
2019-04-18 21:09:32 -04:00
Matthew Bauer f475aeaf29
Merge pull request #59535 from matthewbauer/homepage-fixes
treewide: update homepages to https where available
2019-04-15 20:47:30 -04:00
Matthew Bauer 290a5d916e treewide: update homepages to https where available
Based on "problems" from repology:

https://repology.org/repository/nix_unstable/problems

Mostly simple changes to reflect redirects.
2019-04-15 10:10:05 -04:00
R. RyanTM 49b84c3907 homebank: 5.2.3 -> 5.2.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
2019-04-14 16:29:45 -07:00
R. RyanTM 26db3956e3 gnucash: 3.4 -> 3.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnucash/versions
2019-04-14 13:51:13 -07:00
R. RyanTM 68577a59bf atlassian-cli: 8.0.0 -> 8.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atlassian-cli/versions
2019-04-14 00:28:26 -07:00
aszlig 6b2bd330fa
wordgrinder: Fix sha256 hash
The hash used for fetchFromGitHub was on the archive itself, however
fetchFromGitHub is actually a wrapper of fetchzip:

hash mismatch in fixed-output derivation '...-source':
  wanted: sha256:1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf
  got:    sha256:08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal

When using nix-prefetch-url without the --unpack argument, I get:

1zqx3p9l22njni44ads3fyw3xh6807wmb5k1x2glg61z81cwc6sf

And with the --unpack argument:

08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal

Just to be 100% sure the contents are the same, I also diffed the
contents of the former tarball with the outputs of the unpacked dir and
they're the same.

I didn't actually test the package (which doesn't build right now
anyway), but now at least the source checksum is fixed :-)

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthiasbeyer
2019-04-11 14:58:02 +02:00
Timo Kaufmann bd50fc942b
Merge pull request #56809 from jpathy/patch-2
Zotero: Fix to use patchelf instead of FHS Env.
2019-04-11 00:31:31 +02:00
Ryan Mulligan 2b377504e7
Merge pull request #57359 from dtzWill/update/scribus-1.4.8
scribus: 1.4.7 -> 1.4.8, dep fixups
2019-04-09 20:18:48 -07:00
Pascal Wittmann 14105fd257
Merge pull request #59127 from matthiasbeyer/update-my-packages
Update my packages
2019-04-09 13:47:31 +02:00
Silvan Mosberger cb601bbfed
Merge pull request #58626 from jabranham/ledger
ledger: 3.1.2 -> 3.1.3
2019-04-08 21:47:43 +02:00
Matthias Beyer 19a3abc1b8 wordgrinder: 0.7.1 -> 0.7.2 2019-04-08 10:13:47 +02:00
Pascal Wittmann d5934d3dfc
zim: 0.69.1 -> 0.70 2019-04-06 18:06:36 +02:00
Will Dietz f3724d77a1 qownnotes: 19.3.4 -> 19.4.1 (#59040) 2019-04-06 10:14:58 +00:00
xeji ba01392d91
Merge pull request #58946 from marzipankaiser/fix/grisbi-update
grisbi: 1.0.4 -> 1.2.1
2019-04-04 22:46:43 +02:00
Marcial Gaißert c67332cbee
grisbi: add missing dependency libgsf
Without libgsf, the build fails
2019-04-03 23:02:28 +02:00
Marcial Gaißert 9e696227b8
grisbi: 1.0.4 -> 1.2.1 2019-04-03 23:02:16 +02:00
Carles Pagès 44346895b1 calligra: mark broken
Fails to start, kde home not found.
2019-04-02 01:06:20 +02:00
Alex Branham 641ef35b6a
ledger: 3.1.2 -> 3.1.3 2019-03-31 11:39:41 -05:00
worldofpeace ba25c931a3 notes-up: 1.6.3 -> 2.0.0
Changelog: https://github.com/Philip-Scott/Notes-up/compare/1.6.3..2.0.0

https://github.com/Philip-Scott/Notes-up/releases/tag/2.0.0
2019-03-30 22:04:09 -04:00
Will Dietz 9a5cd6cdfb qownnotes: 19.3.0 -> 19.3.4 2019-03-29 17:58:07 -05:00
Will Dietz 6d7d5759fc trilium: 0.30.4 -> 0.30.6 2019-03-29 02:33:48 -05:00
Maximilian Bosch 315643e12b
Merge pull request #58004 from r-ryantm/auto-update/atlassian-cli
atlassian-cli: 7.8.0 -> 8.0.0
2019-03-27 19:34:05 +01:00
Will Dietz 17688c1417 libreoffice-fresh: 6.2.1.2 -> 6.2.2.2 (#58236)
* libreoffice-fresh: 6.2.1.2 -> 6.2.2.2
2019-03-25 06:32:45 +00:00
Jan Tojnar 97eb65324d treewide: no gnome aliases 2019-03-24 14:46:50 -04:00
Tomas Hlavaty fa144d2361 libreoffice: japanese added 2019-03-24 08:39:38 +01:00
Michael Raskin b8ed97001e libreoffice: wrapper: fallback to /tmp if /run is not usable 2019-03-23 12:16:53 +01:00
R. RyanTM 92bd44df8e atlassian-cli: 7.8.0 -> 8.0.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/atlassian-cli/versions
2019-03-20 22:24:38 -07:00
worldofpeace 3e88dfd47f aesop: 1.0.7 -> 1.1.0
https://github.com/lainsce/aesop/releases/tag/1.0.8
https://github.com/lainsce/aesop/releases/tag/1.1.0
2019-03-20 23:10:33 -04:00
Pascal Wittmann 27201851d6
homebank: 5.2.2 -> 5.2.3 2019-03-16 14:57:52 +01:00
R. RyanTM 7de7c5972e cb2bib: 1.9.9 -> 2.0.0 (#55907)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cb2bib/versions
2019-03-15 23:11:23 +01:00
Michael Raskin d8d9a520b3
Merge pull request #57266 from NixOS/libreoffice-update
libreoffice: 6.1.4.2 -> 6.1.5.2, 6.2.1.2
2019-03-15 08:05:54 +00:00
Michael Raskin ab56044f22 libreoffice: 6.1.4.2 -> 6.1.5.2, 6.2.1.2 2019-03-14 06:00:05 +01:00
jpathy 453c91af6e
Fix desktop file. 2019-03-14 09:56:39 +05:30
R. RyanTM 419e25e0ef qownnotes: 19.2.3 -> 19.3.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qownnotes/versions
2019-03-11 17:12:23 -07:00
Will Dietz e3e0f79b9f scribus: 1.4.7 -> 1.4.8, dep fixups
* Needs hunspell not aspell, not sure when
* bake in gs path to avoid warning on launch
* python-pillow for print preview, per README

https://www.scribus.net/scribus-1-4-8-released/
2019-03-11 04:45:09 -05:00
Will Dietz 7911b288c3 trilium: 0.29.1 -> 0.30.4 (#57056)
https://github.com/zadam/trilium/releases/tag/v0.30.4
2019-03-08 21:45:41 +01:00
Jan Tojnar d3ff902e94
webkit: move to aliases 2019-03-06 00:20:55 +01:00
Kjuvi f271f943e0 spice-up: 1.7.0 -> 1.8.0 2019-03-05 22:57:51 +01:00
jpathy 142260c991
Zotero: Fix to use patchelf instead of FHS Env.
Removed buildFHSUserEnv to use `patchelf` on prebuilt binaries and libs. Should fix issue #48814.
2019-03-04 15:25:17 +05:30
R. RyanTM 5d8f93a5da fava: 1.9 -> 1.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fava/versions
2019-03-01 20:18:41 -08:00
Frederik Rietdijk 2fcb11a244 Merge staging-next into master 2019-03-01 09:06:20 +01:00