about summary refs log tree commit diff
path: root/pkgs/tools
Commit message (Collapse)AuthorAge
* nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05Eelco Dolstra2019-09-22
|
* daemon: init at 0.6.4Sander van der Burg2019-09-22
|
* Merge pull request #69248 from rnhmjoj/radeonThomas Tuegel2019-09-22
|\ | | | | radeon-profile: 20170714 -> 20190903
| * radeon-profile: 20170714 -> 20190903rnhmjoj2019-09-22
| |
| * radeon-profile: use Qt mkDerivationrnhmjoj2019-09-22
| |
* | Merge pull request #69229 from marsam/use-buildGoPackageadisbladis2019-09-22
|\ \ | | | | | | treewide: use buildGoPackage in packages which vendor dependencies
| * | vault: use buildGoPackageMario Rodas2019-09-21
| | |
| * | lazydocker: use buildGoPackageMario Rodas2019-09-21
| | |
| * | wallutils: use buildGoPackageMario Rodas2019-09-21
| | |
| * | systemd-journal2gelf: use buildGoPackageMario Rodas2019-09-21
| | |
| * | certigo: use buildGoPackageMario Rodas2019-09-21
| | |
| * | vale: use buildGoPackageMario Rodas2019-09-21
| | |
* | | cargo-release: 0.10.5 -> 0.12.4 (#69245)Jörg Thalheim2019-09-22
|\ \ \ | | | | | | | | cargo-release: 0.10.5 -> 0.12.4
| * | | cargo-release: 0.10.5 -> 0.12.4Tobias Happ2019-09-22
| | | |
* | | | Merge pull request #69092 from talyz/nomachine-6.8.1Elis Hirwing2019-09-22
|\ \ \ \ | | | | | | | | | | nomachine-client: 6.7.6 -> 6.8.1
| * | | | nomachine-client: 6.7.6 -> 6.8.1talyz2019-09-19
| | | | |
* | | | | Merge pull request #69164 from bbigras/starshipMario Rodas2019-09-21
|\ \ \ \ \ | |_|_|/ / |/| | | | starship: 0.17.0 -> 0.18.0
| * | | | starship: 0.17.0 -> 0.18.0Bruno Bigras2019-09-20
| | |_|/ | |/| |
* | | | Revert "Merge branch 'staging-next'"Vladimír Čunát2019-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
* | | | Merge pull request #69174 from HugoReeves/masterworldofpeace2019-09-21
|\ \ \ \ | | | | | | | | | | croc: 6.1.1 -> 6.1.3
| * | | | croc: 6.1.1 -> 6.1.3Hugo Reeves2019-09-21
| | |_|/ | |/| |
* | | | Merge pull request #69177 from rnhmjoj/bupmarkuskowa2019-09-21
|\ \ \ \ | | | | | | | | | | bup: 0.29.2 -> 0.29.3
| * | | | bup: 0.29.2 -> 0.29.3rnhmjoj2019-09-20
| | |/ / | |/| |
* | | | Merge branch 'staging-next'Vladimír Čunát2019-09-21
|\ \ \ \
| * \ \ \ Merge master into staging-nextFrederik Rietdijk2019-09-19
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2019-09-18
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2019-09-16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2019-09-15
| |\ \ \ \ \ \ \
| * | | | | | | | networkmanager,modemmanager: fix service symlinks for systemd v243Will Dietz2019-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problems such as: systemd[1]: Failed to put bus name to hashmap: File exists systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation. Problem is that systemd treats symlinks to files outside the service path differently, causing our old workaround to look like two separate services. These symlinks are intended to be a means for manually emulating the behavior of the `Alias=` directive in these services. Unfortunately even making these symlinks relative isn't enough, since they don't make it to where it matters-- that only makes the links in /etc/static/systemd/system/* relative, with systemd still being shown non-relative links in /etc/systemd/system/*. To fix this, drop all of this at the package level and instead simply specify the aliases in the NixOS modules. Also handle the same for modemmanager, since the networkmanager NixOS module also handles that.
| * | | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2019-09-12
| |\ \ \ \ \ \ \ \
| * | | | | | | | | tree-wide: replace wrapProgram with wrapGAppJan Tojnar2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where appropriate
| * | | | | | | | | Merge branch 'staging-next' into stagingJan Tojnar2019-09-10
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | treewide: replace mysql.connector-c to libmysqlclientIzorkin2019-09-09
| | | | | | | | | | |
* | | | | | | | | | | zbar: disable Qt assertionsPierre Bourdon2019-09-21
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Greatly decreases zbar-lib transitive closure size: assertion messages contain paths to Qt header files, causing zbar-lib to depend on qtbase-dev. The Qt specific mkDerivation normally does this automatically, but we can't use it here due to having only a small part of the project being Qt related.
* | | | | | | | | | Merge pull request #68178 from utdemir/init-shunit2Silvan Mosberger2019-09-20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | shunit2: init at 2019-08-10
| * | | | | | | | | shunit2: init at 2019-08-10Utku Demir2019-09-06
| | | | | | | | | |
* | | | | | | | | | Merge pull request #68961 from eraserhd/pr/master/plan9port-missing-whichAnderson Torres2019-09-20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | plan9port: use command instead of which in builder.sh
| * | | | | | | | | | plan9port: do not use which in builder.shJason Felice2019-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the build time dependency on which broke builder.sh
* | | | | | | | | | | Merge pull request #69103 from dtzWill/update/tor-0.4.1.6Joachim F2019-09-20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tor: 0.4.1.5 -> 0.4.1.6
| * | | | | | | | | | | tor: 0.4.1.5 -> 0.4.1.6Will Dietz2019-09-19
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://blog.torproject.org/new-release-tor-0416
* | | | | | | | | | | squashfsTools: 4.4dev_20180612 -> 4.4 (#68275)Jörg Thalheim2019-09-20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | squashfsTools: 4.4dev_20180612 -> 4.4
| * | | | | | | | | | | squashfsTools: use updated Darwin patchRuud van Asseldonk2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new patch is the patch between 4.4, and commit [1], a pull request at [2] to upsteam Mac and BSD compatibility. That pull request is itself a rebase of an older pull request for an earlier version of squashfs-tools. I squashed all commits between 4.4 and [1], apart from the BSD-specific ones, and exported the new patch from that. Attached below is the git diff --ignore-space-change between squashfs-tools 4.4 with the previous patch applied, and with the new patch applied. [1]: 7d31beec53e6245d3405d6ef2b96e9811ae07044 [2]: https://github.com/plougher/squashfs-tools/pull/69 --- diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c index 8efefe6..5c2f835 100644 --- a/squashfs-tools/info.c +++ b/squashfs-tools/info.c @@ -159,7 +159,7 @@ void *info_thrd(void *arg) case EINTR: continue; default: - BAD_ERROR("sigwaitfailed " + BAD_ERROR("sigwait failed " "because %s\n", strerror(errno)); } } diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c index 67d86a5..3607448 100644 --- a/squashfs-tools/mksquashfs.c +++ b/squashfs-tools/mksquashfs.c @@ -35,7 +35,10 @@ #include <stddef.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef linux +#ifndef linux +#include <sys/sysctl.h> +#else +#include <sys/sysinfo.h> #include <sys/sysmacros.h> #endif #include <fcntl.h> @@ -52,7 +55,6 @@ #include <sys/wait.h> #include <limits.h> #include <ctype.h> -#include <sys/sysinfo.h> #ifndef FNM_EXTMATCH /* glibc extension */ #define FNM_EXTMATCH 0 @@ -5191,7 +5193,17 @@ int parse_mode(char *arg, mode_t *res) int get_physical_memory() { + /* + * Long longs are used here because with PAE, a 32-bit + * machine can have more than 4GB of physical memory + * + * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted. + * If it fails use sysinfo, if that fails return 0 + */ + long long num_pages = sysconf(_SC_PHYS_PAGES); + long long page_size = sysconf(_SC_PAGESIZE); int phys_mem; + #ifndef linux #ifdef HW_MEMSIZE #define SYSCTL_PHYSMEM HW_MEMSIZE @@ -5221,16 +5233,6 @@ int get_physical_memory() } #undef SYSCTL_PHYSMEM #else - /* - * Long longs are used here because with PAE, a 32-bit - * machine can have more than 4GB of physical memory - * - * sysconf(_SC_PHYS_PAGES) relies on /proc being mounted. - * If it fails use sysinfo, if that fails return 0 - */ - long long num_pages = sysconf(_SC_PHYS_PAGES); - long long page_size = sysconf(_SC_PAGESIZE); - if(num_pages == -1 || page_size == -1) { struct sysinfo sys; int res = sysinfo(&sys); diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h index 88d0b5c..1beefef 100644 --- a/squashfs-tools/mksquashfs.h +++ b/squashfs-tools/mksquashfs.h @@ -24,7 +24,6 @@ * mksquashfs.h * */ -#include <pthread.h> struct dir_info { char *pathname; diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c index f8fd529..48e6b27 100644 --- a/squashfs-tools/pseudo.c +++ b/squashfs-tools/pseudo.c @@ -30,7 +30,6 @@ #include <errno.h> #include <string.h> #include <stdlib.h> -#include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> #include <sys/stat.h> diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c index 00615ce..c1a6183 100644 --- a/squashfs-tools/unsquashfs.c +++ b/squashfs-tools/unsquashfs.c @@ -38,7 +38,6 @@ #include <sys/sysinfo.h> #include <sys/sysmacros.h> #endif - #include <sys/types.h> #include <sys/time.h> #include <sys/resource.h> @@ -1085,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i) break; case SQUASHFS_SYMLINK_TYPE: case SQUASHFS_LSYMLINK_TYPE: { - struct timespec times[2] = { + struct timeval times[2] = { { i->time, 0 }, { i->time, 0 } }; @@ -1104,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i) goto failed; } - res = utimensat(AT_FDCWD, pathname, times, - AT_SYMLINK_NOFOLLOW); + res = lutimes(pathname, times); if(res == -1) { EXIT_UNSQUASH_STRICT("create_inode: failed to set time on " "%s, because %s\n", pathname,
| * | | | | | | | | | | squashfsTools: make Darwin patch apply to 4.4Ruud van Asseldonk2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I took the patch, and applied it on top of the previous squashfs-tools commit that we packaged. It applied cleanly. Then I rebased that on top of master, and resolved the conflicts. I'm not sure I resolved them correctly though, I don't have access to Darwin. Somebody needs to review this.
| * | | | | | | | | | | squashfsTools: make alignment patch apply to 4.4Ruud van Asseldonk2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I took the patch, and applied it on top of the previous squashfs-tools commit that we packaged (which required editing one line in the patch, as it assumed to be applied on top of the reproducibility patches). Then I rebased that on top of master, resolved one conflict, and I formatted a new patch for this.
| * | | | | | | | | | | squashfsTools: 4.4dev_20180612 -> 4.4Ruud van Asseldonk2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new release has been made upstream. Reproducibility issues were fixed in that release, so we no longer need those patches. For a full overview of the changes, see the 4.4-specific readme at [1]. The alignment patch no longer applies cleanly; I disabled it for now, and I will try to restore it in a follow-up commit. [1]: https://github.com/plougher/squashfs-tools/blob/52eb4c279cd283ed9802dd1ceb686560b22ffb67/README-4.4
* | | | | | | | | | | | httpie: use python3 by defaultMaximilian Bosch2019-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This package is intended to be used as application and supports python3[1] (and is about to deprecated python2.7 support[2]), so there's no reason to not use it in 2019. [1] https://github.com/jakubroztocil/httpie/tree/1.0.3#python-version [2] https://github.com/jakubroztocil/httpie/commit/b3d2c1876e23e7de7afe588e4f64160d17201b45
* | | | | | | | | | | | Merge pull request #69094 from madjar/fix-httpieMaximilian Bosch2019-09-20
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | httpie: add missing 'setuptools' to propagatedBuildInputs
| * | | | | | | | | | | | httpie: add missing 'setuptools' to propagatedBuildInputsGeorges Dubus2019-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a side-effect of f7e28bf, the build no longer propagated 'setuptools', which is a run-time dependency. See #68314 for further details.
* | | | | | | | | | | | | ip2unix: 2.1.0 -> 2.1.1aszlig2019-09-20
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a small bugfix release (essentially adds two lines of code) which fixes a segfault if using with a program that doesn't pass a sockaddr buffer to accept() or accept4(). Signed-off-by: aszlig <aszlig@nix.build>
* | | | | | | | | | | | Merge pull request #69049 from dtzWill/update/datamash-1.5Marek Mahut2019-09-19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | datamash: 1.4 -> 1.5
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-06 09:15:04 +0000