Commit Graph
100 Commits
Author SHA1 Message Date
Jan Tojnar b0f40bef4f Merge pull request #97045 from jtojnar/netpbm-10.91.2 2020-10-05 22:25:51 +02:00
Jan Tojnar 46cf3b84b1 netpbm: 10.91.3 → 10.92.0 2020-10-02 13:33:36 +02:00
Jan TojnarandChristian Kampka 43ea7e011d netpbm: Fix cross-compilation
Co-Authored-By: Christian Kampka <christian@kampka.net>
2020-10-02 13:05:39 +02:00
Jan Tojnar d509c583fc jbigkit: fix cross-compilation 2020-10-02 13:05:38 +02:00
Jan Tojnar 3f3fe38c7a netpbm: Do not use vendored dependencies
Especially since Jasper is unmaintained and insecure
2020-10-02 13:05:38 +02:00
Jan Tojnar 8a9fa4782f netpbm: 10.89.1 → 10.91.3
Also fix accidentally not running postConfigure
2020-10-02 13:05:38 +02:00
Jan Tojnar 74c5472090 Merge pull request #98304 from jtojnar/updateScript-commit3
maintainers/scripts/update.nix: Add support for auto-commiting changes
2020-10-02 06:16:09 +02:00
Jan Tojnar 239a6e5795 Merge pull request #98926 from r-ryantm/auto-update/appstream-glib
appstream-glib: 0.7.17 -> 0.7.18
2020-09-29 18:45:37 +02:00
Jan Tojnar a7f375d335 Merge pull request #98909 from r-ryantm/auto-update/xdg-desktop-portal
xdg-desktop-portal: 1.7.2 -> 1.8.0
2020-09-29 16:26:56 +02:00
Jan Tojnar 515cf9c405 haskellPackages: unbreak 2020-09-25 21:08:12 +02:00
Jan Tojnar 2c162d49cd Merge pull request #98749 from freezeboy/fix-rpm-ostree
rpm-ostree: 2020.4 -> 2020.5
2020-09-25 20:08:05 +02:00
Jan Tojnar 6d518ddf77 Merge pull request #98503 from jtojnar/doc-prompts 2020-09-24 22:48:38 +02:00
Jan Tojnar e6ce041cae nixos/doc: Improve code listings
By adding prompts and replaceables and removing unnecessary indentation.
2020-09-23 01:25:25 +02:00
Jan Tojnar e1af37634b doc: Improve code listings
By adding prompts and removing unnecessary indentation.
2020-09-23 01:25:25 +02:00
Jan Tojnar aeba05f2e4 Merge pull request #96951 from doronbehar/pkg/gnome-network-displays
gnome-network-displays: init at 0.90.4
2020-09-21 01:23:28 +02:00
Jan Tojnar 74a5bb4041 maintainers/scripts/update.nix: Clean up
- Make some arguments more fitting (the path is actually full, not just relative to prefix…).
- Increase the purity of packages* functions (they now take pkgs from argument, not from scope).
- Add some documentation comments.
2020-09-20 21:22:04 +02:00
Jan Tojnar 71c246c785 maintainers/scripts/update.nix: Run update scripts from the worktree
`update.nix` extracts `passthru.updateScript` attributes in the main repo
and when they are relative paths (e.g. `./update.sh`), Nix will resolve them
to absolute paths in the main repo.

Update scripts can use $(dirname $0) to get the location of files they
should update but that would point to the main repo.
We want them to modify the appropriate git worktree instead
so we replace the prefix accordingly.

`git rev-parse --show-toplevel` will resolve symlinks but, fortunately,
Nix will do that as well, so the path will match:

https://github.com/NixOS/nixpkgs/pull/98304#issuecomment-695761754
2020-09-20 20:12:34 +02:00
Jan Tojnar 0c5ddf3358 maintainers/scripts/update.nix: run update script with UPDATE_NIX_ATTR_PATH
The environment variable will contain the attribute path the script is supposed to update.
2020-09-20 20:12:33 +02:00
Jan Tojnar c1b05442ff doc: Undocument attr-set of passthru.updateScript
We no longer need it for most use cases so I am making it experimental.

I have something in mind where it might be useful in the future (customizing commit messages)
but for now, it would only confuse people.
2020-09-20 20:12:32 +02:00
Jan Tojnar c21a85c6a0 maintainers/scripts/update.nix: auto-detect attrPath 2020-09-20 20:11:46 +02:00
Jan Tojnar b351de0971 maintainers/scripts/update.nix: mention when there were no changes committed 2020-09-20 20:11:46 +02:00
Jan Tojnar b828285933 maintainers/scripts/update.nix: support filling in auto-commit attributes
We can determine all of them when attrPath is present so we might jsut as well do it.
2020-09-20 20:11:46 +02:00
Jan Tojnar 4a161ddb3b maintainers/scripts/update.nix: support auto-committing by passing attrPath
Instead of having the updateScript support returning JSON object,
it should be sufficient to specify attrPath in passthru.updateScript.
It is much easier to use.

The former is now considered experimental.
2020-09-20 20:11:46 +02:00
Jan Tojnar 01b9d5371c maintainers/scripts/update.nix: switch to asyncio
This will make it cleaner and also better respect SIGTERM.
2020-09-20 20:11:45 +02:00
Jan Tojnar 17f89667b3 maintainers/scripts/update.nix: refactoring
Get rid of some globals, split main into smaller functions, rename some variables, add typehints.
2020-09-20 20:11:45 +02:00
Jan Tojnar 74c1b8deb2 gnome3.updateScript: implement commit feature 2020-09-20 20:11:45 +02:00
Jan Tojnar 1efc042d92 maintainers/scripts/update.nix: Add support for auto-commiting changes
Update scripts can now declare features using

	passthru.updateScript = {
	  command = [ ../../update.sh pname ];
	  supportedFeatures = [ "commit" ];
	};

A `commit` feature means that when the update script finishes successfully,
it will print a JSON list like the following:

	[
	  {
	    "attrPath": "volume_key",
	    "oldVersion": "0.3.11",
	    "newVersion": "0.3.12",
	    "files": [
	      "/path/to/nixpkgs/pkgs/development/libraries/volume-key/default.nix"
	    ]
	  }
	]

and data from that will be used when update.nix is run with --argstr commit true
to create commits.

We will create a new git worktree for each thread in the pool and run the update
script there. Then we will commit the change and cherry pick it in the main repo,
releasing the worktree for a next change.
2020-09-20 20:11:22 +02:00
Jan Tojnar d351cea9f3 common-updater-scripts: add --print-changes flag
Printing the changed file and new version can be used to commit the changes to git.
2020-09-19 17:02:54 +02:00
Jan Tojnar 5adbeb13c5 update.nix: use ThreadPoolExecutor
Not sure why I chose ProcessPoolExecutor in the first place.
2020-09-18 20:52:07 +02:00
Jan Tojnar db64508779 ufraw: mark broken
It does not build so let's mark it broken in order for gimp-with-plugins not to be broken.

Fixes: https://github.com/NixOS/nixpkgs/issues/98103
2020-09-16 16:58:36 +02:00
Jan Tojnar 9763e55345 Merge pull request #97862 from jtojnar/emoji-inkscape-fix 2020-09-14 01:43:57 +02:00
Jan Tojnar 24a6d1152d twemoji-color-font: fix build with Inkscape 1 2020-09-13 23:13:57 +02:00
Jan Tojnar f355352177 emojione: fix build with Inkscape 1 2020-09-13 23:13:54 +02:00
Jan Tojnar 489f4d807b Merge pull request #97839 from jtojnar/deja-dup-42.4
deja-dup: 40.6 → 42.4
2020-09-12 17:46:48 +02:00
Jan Tojnar 272e4273f0 alsa-utils: do not sed info script (#97841)
The script contains lspci.log file names and the overeager replacement breaks it.
2020-09-12 15:20:14 +00:00
Jan Tojnar b31de37eba deja-dup: 40.6 → 42.4
https://gitlab.gnome.org/World/deja-dup/-/releases#42.4

- Nautilus extension no longer supported (https://gitlab.gnome.org/World/deja-dup/merge_requests/42)
2020-09-12 17:18:14 +02:00
Jan Tojnar 607509ac8f Merge pull request #97690 from jtojnar/inkscape-1.0.1 2020-09-12 16:30:53 +02:00
Jan Tojnar 52df62ec9b almanah: 0.12.0 → 0.12.2
https://gitlab.gnome.org/GNOME/almanah/-/compare/0.12.0...0.12.2
2020-09-12 15:37:52 +02:00
Jan Tojnar 1bdad26c20 malcontent: 0.8.0 → 0.9.0
https://gitlab.freedesktop.org/pwithnall/malcontent/-/releases/0.9.0
2020-09-12 15:27:27 +02:00
Jan Tojnar 1510876ee9 enchant: 2.2.10 → 2.2.11
https://github.com/AbiWord/enchant/releases/tag/v2.2.11
2020-09-12 15:08:04 +02:00
Jan Tojnar f16e6f5f66 libxmlb: 0.2.0 → 0.2.1
https://github.com/hughsie/libxmlb/compare/0.2.0...0.2.1
2020-09-12 15:01:25 +02:00
Jan Tojnar 595e61d837 flatpak: 1.8.1 → 1.8.2
https://github.com/flatpak/flatpak/releases/tag/1.8.2
2020-09-12 15:01:25 +02:00
Jan Tojnar 31081be0d9 fwupd: 1.4.5 → 1.4.6
https://github.com/fwupd/fwupd/releases/tag/1.4.6

Also drop some unneeded dependencies.
2020-09-12 13:28:52 +02:00
Jan Tojnar f9fbbd519e fwupd: clean up
* reorder attributes to match standard
* do not use package aliases
* add some comments
* fix license (https://github.com/fwupd/fwupd/issues/526)
2020-09-12 13:28:52 +02:00
Jan Tojnar 786d9316ad gnome3.eog: format
* format with nixpkgs-fmt
* replace name with pname & version
* use pkg-config instead of pkgconfig alias
2020-09-11 11:33:38 +02:00
Jan Tojnar 8060ecb97d exiv2: re-enable split outputs
Needs an extra patch to fix CMake config.

This reverts commit f8f840f664.
2020-09-10 22:34:19 +02:00
Jan Tojnar 35deaa45a1 inkscape_0: drop
Inkscape 1.0.1 re-added the old CLI flags:
https://gitlab.com/inkscape/inkscape/-/commit/3ca6a4ed08405f2a530a9ed3065f77443f9f7ebe
2020-09-10 20:46:55 +02:00
Jan Tojnar a45e68be36 inkscape: 1.0 → 1.0.1
https://inkscape.org/news/2020/09/06/inkscape-version-101-patches-crashes-bugs/
https://inkscape.org/release/inkscape-1.0.1/
2020-09-10 20:35:33 +02:00
Jan Tojnar 26f8b201a1 Merge pull request #97416 from jtojnar/mypaint-hicolor
mypaint: fix crash without hicolor-icon-theme
2020-09-08 09:39:05 +02:00
Jan Tojnar 492de7bb2b mypaint: fix crash without hicolor-icon-theme
Mypaint seems to check for a presence of this theme scaffold and crashes when not present.
Let’s add this since it weights almost nothing.
2020-09-08 05:35:27 +02:00
Jan Tojnar 3dc2c52851 exiv2: clean up
- EXIV2_BUILD_PO has been replaced by EXIV2_ENABLE_NLS
  https://github.com/Exiv2/exiv2/commit/076585d1476283bc7cffcf08e9006fc64ffbfa10
  Confusingly, the former still appears in the flag summary.
- Remove enableParallelBuilding since it is on by default with CMake
- Reorder the expression
- Apply upstream GNUInstallDirs patch
- Build stuff in build phase, not in install phase
- Add maintainers field (empty at the moment)
2020-09-07 17:02:31 +02:00
Jan Tojnar 87ec0fb5f3 Merge pull request #96982 from graham33/fix/96981_suitesparse_dylib_names
suitesparse: rename fixDarwinDylibNames override
2020-09-07 16:51:07 +02:00
Jan Tojnar f0cb5c6a15 Revert "nixos/fontconfig: fix 50-user.conf handling"
This reverts commit 8425726f86.

This should have been reverted in https://github.com/NixOS/nixpkgs/pull/95358
but I forgot about it.
2020-09-06 02:56:31 +02:00
Jan Tojnar b89f1226cc Merge branch 'staging-next' into staging 2020-09-05 00:32:01 +02:00
Jan Tojnar 346dee1a96 Merge branch 'master' into staging-next 2020-09-05 00:31:19 +02:00
Jan Tojnar e2a89f8cf2 Merge pull request #96648 from paperdigits/exiv2-0.27.3
exiv2: 0.27.2 -> 0.27.3
2020-09-05 00:23:14 +02:00
Jan Tojnar 4f0f26771e Merge pull request #95358 from jtojnar/global-fontconfig 2020-09-05 00:19:38 +02:00
Jan Tojnar 951efe41e1 fixup! nixos/doc/releases: update the docs as promised 2020-09-04 10:59:06 -07:00
Jan Tojnar 5079e1cd3b Merge pull request #96939 from jtojnar/drop-gst-010 2020-09-04 17:13:43 +02:00
Jan Tojnar 7ecabdc22b Merge pull request #96992 from jtojnar/fc-dtd-urn
treewide: use URN for fontconfig DTD
2020-09-04 17:12:29 +02:00
Jan Tojnar f6c94e7072 netpbm: clean up
reorder attributes and use pkg-config instead of the alias
2020-09-03 22:26:30 +02:00
Jan Tojnar 6f96063804 makeFontsConf: clean up
The use of the argument was removed in 2016 but its definition was left behind.

https://github.com/NixOS/nixpkgs/commit/cd2948a72e3116a3a42f1f523fe2638db994362c
2020-09-03 09:42:58 +02:00
Jan Tojnar 6dd3b54ccc treewide: use URN for fontconfig DTD
To match upstream change:

https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/9c46ef4aac87c42d013d0e7380b6aeb03e1a9949
2020-09-03 06:39:00 +02:00
Jan Tojnar dff0034a8b Merge pull request #96948 from jtojnar/fix-pitivi 2020-09-02 21:25:01 +02:00
Jan Tojnar 0d83d01dfe Merge pull request #96911 from kampka/glibmm
glibmm: Add glib to nativeBuildInputs
2020-09-02 19:34:27 +02:00
Jan Tojnar 84d0f3fa7d pkgsMusl.libusb-compat-0_1: fix eval
e89e2edc73 did not move all files when moving the directory.

Fixes: https://github.com/NixOS/nixpkgs/issues/96947
2020-09-02 07:38:09 +02:00
Jan Tojnar 2c152eed4c pitivi: Fix build
The latest version is not compatible with Python 3.8,
let's cherry-pick some patches from master.

Also pre-prepare for incoming release of GStreamer 1.18.
2020-09-02 07:25:19 +02:00
Jan Tojnar 34c2ad1474 pitivi: clean up
* format with nixpkgs-fmt
* use pkg-config instead of pkgconfig alias
* reorder attributes
* move version inside the mkDerivation
2020-09-02 06:29:49 +02:00
Jan Tojnar 4a4e642aba gstreamer: drop legacy
It has been abandoned for ages, insecure, and now finally broken.
2020-09-02 04:01:07 +02:00
Jan Tojnar 9a1f60994b tiscamera: clean up
- use pkg-config instead of pkgconfig alias
- use placeholders for cmakeFlags
- do not skip build rpath
- udev replacements no longer apply https://github.com/TheImagingSource/tiscamera/commit/47d4fb246b5f82763f87ad57c7d1ed3420655e96

There are some misplaced dependencies like gobject-introspection and orc that should probably go to nativeBuildInputs but upstream detects them incorrectly.
2020-09-02 04:01:06 +02:00
Jan Tojnar cc4f18ec47 tiscamera: drop legacy gst 2020-09-02 04:01:06 +02:00
Jan Tojnar 8bc01e4029 webcamoid: drop legacy gst 2020-09-02 04:01:06 +02:00
Jan Tojnar 9fb67a2592 googleearth: do not use legacy gst 2020-09-02 04:01:06 +02:00
Jan Tojnar 4c82b0ce33 gst_all_1.gst-validate: use correct gstreamer
previously it was using the legacy one
2020-09-02 02:42:29 +02:00
Jan Tojnar d2d24c9a2b appimage: remove ancient gst dep
it is insecure and broken
2020-09-02 02:24:07 +02:00
Jan Tojnar 5a1a7d3dcc steam-run: remove ancient gstreamer dependency
It is insecure and broken.

Follow https://github.com/NixOS/nixpkgs/pull/93398
2020-09-02 02:23:54 +02:00
Jan Tojnar e68e048e50 qt4: drop multimedia & webkit options
They have been broken and disabled for ages and now the dependencies are being removed.
2020-09-02 02:18:09 +02:00
Jan Tojnar 840116150c Merge pull request #96120 from jtojnar/cleaner-wx 2020-09-02 02:06:34 +02:00
Jan Tojnar 77293baff0 strigi: drop
It has not been used by KDE for many years and depends on umaintained libraries we want to drop (Qt4 and Gamin).
2020-09-02 02:05:40 +02:00
Jan Tojnar 88bf62113b fail2ban: drop unused gamin arg 2020-09-02 01:35:24 +02:00
Jan Tojnar a6d113b1ce glib: remove fam module todo
gamin is abandoned and we are going to drop it
2020-09-02 01:35:21 +02:00
Jan Tojnar fa50d74be3 Merge pull request #93802 from r-ryantm/auto-update/libraw
libraw: 0.19.5 -> 0.20.0
2020-09-01 23:43:02 +02:00
Jan Tojnar 3b68a757ff nixos/gpaste: return sessionPath
GPaste ships keybindings for gnome-control-center. Those depend on GSettings schemas
but there is currently no mechanism for loading schemas other than using global ones
from $XDG_DATA_DIRS. Eventually, I want to add such mechanism but until then,
let's return the impure sessionPath option that was removed in
https://github.com/NixOS/nixpkgs/commit/f63d94eba340c05cd241c478deb518204514fce8
2020-09-01 22:21:09 +02:00
Jan Tojnar 071b49b380 Merge pull request #95897 from dasj19/orca-updates
gnome3.orca: 3.36.4 -> 3.36.5
2020-08-30 20:47:38 +02:00
Jan Tojnar e487caa3a7 Merge pull request #94272 from r-ryantm/auto-update/gtk-layer-shell
gtk-layer-shell: 0.1.0 -> 0.2.0
2020-08-30 10:44:32 +02:00
Jan Tojnar ddd234cc6f gcolor3: 2.3.1 → 2.4.0
https://gitlab.gnome.org/World/gcolor3/-/blob/v2.4.0/data/nl.hjdskes.gcolor3.appdata.xml.in#L48-61
2020-08-30 08:13:54 +02:00
Jan Tojnar 5cfd8275a6 pyexcel-xls: 0.5.8 → 0.5.9 2020-08-30 01:13:57 +02:00
Jan Tojnar 48413581b1 python3.pkgs.pyexcel-ods: init at 0.5.6 2020-08-29 10:20:47 -07:00
Jan Tojnar 9357dfc299 python3.pkgs.pyexcel-xsl: init at 0.5.8 2020-08-29 10:20:47 -07:00
Jan Tojnar cadb4676c6 python3.pkgs.pyexcel: init at 0.6.4 2020-08-29 10:20:47 -07:00
Jan Tojnar 4bfca7c751 python3.pkgs.pyexcel-io: init at 0.5.20 2020-08-29 10:20:47 -07:00
Jan Tojnar 7e14da6138 python3.pkgs.lml: init at 0.9.0 2020-08-29 10:20:47 -07:00
Jan Tojnar 136aa40a0f Merge branch 'staging-next' into staging 2020-08-29 19:18:17 +02:00
Jan Tojnar b49a769970 fontconfig: get rid of rest of versioned configs
The incompatibility does not seem to exist any more: programs linked against fc 2.12
on fc 2.14 system seem to at least display text, even while printing tons of errors
(as long as you generate fc cache manually), and same thing the other way around.
Hopefully it will not be an issue in the future.
2020-08-29 19:16:22 +02:00
Jan Tojnar 89401d986c Revert "fontconfig: Only read versioned config dirs"
This reverts commit edf2541f02.

Turns out lot of software (including Chromium) use bundled fontconfig
so we either need to wrap every one of those, or re-introduce the global
unversioned config. The latter is easier but weakens hermetic configs.

But perhaps those are not really worth the effort. Given that programs
linked against fc 2.12.6 on fc 2.13.92 system seem to at least display text,
even while printing tons of errors (as long as you generate fc cache manually),
and same thing the other way around, hopefully it will not be an issue in the future.

We give up on the hermetic configs in exchange for getting rid of lot of complexity.
2020-08-29 19:15:36 +02:00
Jan Tojnar 2fd206f78b wxGTK31-gtk2: drop ancient deps
GConf has been abandoned for many years and would not work without user running the daemon.
2020-08-27 20:32:40 +02:00
Jan Tojnar e2d02a84d6 wxGTK30-gtk2: drop ancient deps
GConf has been abandoned for many years and would not work without user running the daemon.
2020-08-27 20:32:40 +02:00
Jan Tojnar 6de7492703 wxGTK29: drop ancient deps
The many-years abandoned GStreamer 0.10 branch no longer builds so let's remove it. Hopefully nothing used it these days.

GConf has been abandoned for years too and would not work without user running the daemon.
2020-08-27 20:32:38 +02:00
Jan Tojnar 55a7a01e80 wxGTK28: drop ancient deps
The many-years abandoned GStreamer 0.10 branch no longer builds so let's remove it. Hopefully nothing used it these days.

GConf has been abandoned for years too and would not work without user running the daemon.
2020-08-24 01:23:01 +02:00
Jan Tojnar 2ff80c4b3f xfce.xfce4-volumed: drop
Unmaintained and broken
2020-08-23 22:38:00 +02:00