cgit cannot serve patches with stable hashes, so store these patches
in-tree. cgit community discussion about this problem:
https://lists.zx2c4.com/pipermail/cgit/2017-February/003470.html
We pull the patches in-tree rather than strip cgit footers with fetchpatch
because per https://github.com/NixOS/nixpkgs/pull/61471#issuecomment-493218587
dependencies of fetchpatch cannot use fetchpatch.
Verification that the only difference between the live page, the
patch committed here, and the version cached under the old hash at
tarballs.nixos.org is the cgit version footer:
$ curl -s -L http://tarballs.nixos.org/sha256/"$(nix-hash --type sha256 --to-base16 0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64)" > Allow_input_files_to_be_missing_for_ed-style_patches.patch
$ diff -U0 --label cgit-live <( curl -s -L https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 ) Allow_input_files_to_be_missing_for_ed-style_patches.patch
--- cgit-live
+++ Allow_input_files_to_be_missing_for_ed-style_patches.patch 2020-01-29 17:22:00.077312937 -0800
@@ -32 +32 @@
-cgit v1.2.1
+cgit v1.0-41-gc330
$ curl -s -L http://tarballs.nixos.org/sha256/"$(nix-hash --type sha256 --to-base16 1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg)" > CVE-2018-1000156.patch
$ diff -U0 --label cgit-live <( curl -s -L https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d ) CVE-2018-1000156.patch
--- cgit-live
+++ CVE-2018-1000156.patch 2020-01-29 17:23:41.021116969 -0800
@@ -210 +210 @@
-cgit v1.2.1
+cgit v1.0-41-gc330
Upstream announcement:
https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00002.html
For the lazy:
> * Noteworthy changes in release 4.8 (2020-01-14) [stable]
>
> ** Bug fixes
>
> "sed -i" now creates temporary files with correct umask (limited to u=rwx).
> Previously sed would incorrectly set umask on temporary files, resulting
> in problems under certain fuse-like file systems.
> [bug introduced in sed 4.2.1]
>
> ** Release
>
> distribute gzip-compressed tarballs once again
>
> ** Improvements
>
> a year's worth of gnulib development, including improved DFA performance
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Change the source from dag.wieers.com to github, which seems to
officially host the source code of the project now.
Update unoconv from 0.6 to 0.8.2, which includes several important
changes.
Delete the patch, since it has already become part of the project.
Naive concatenation of $LD_LIBRARY_PATH can result in an empty
colon-delimited segment; this tells glibc to load libraries from the
current directory, which is definitely wrong, and may be a security
vulnerability if the current directory is untrusted. (See #67234, for
example.) Fix this throughout the tree.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
https://hydra.nixos.org/build/108321871https://hydra.nixos.org/build/108556036
Things done:
* SSE2 isn't available for the aarch64-target of GCC (the package builds
on aarch64 without those flags and works fine as well).
* Added missing darwin libraries.
* Applied a darwin-specific patch which disables i386 as target platform
(breaks at least on MacOS catalina otherwise).
Idea shamelessly stolen from 4e60b0efae.
I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.
As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.
I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
Fails to build on Darwin:
clang++ -shared -s highlight_wrap.o -L../../src/ -lhighlight -L/nix/store/bi85dm5dqzjfm0i9qj3ijjj9w9xayy8w-lua-5.2.4/lib -llua -lm -o highlight.so
ld: warning: option -s is obsolete and being ignored
Undefined symbols for architecture x86_64:
"_PL_markstack_max", referenced from:
__wrap_DataDir_getLangPath in highlight_wrap.o
__wrap_DataDir_getThemePath in highlight_wrap.o
__wrap_DataDir_getFiletypesConfPath in highlight_wrap.o
__wrap_DataDir_getPluginPath in highlight_wrap.o
__wrap_DataDir_guessFileType in highlight_wrap.o
__wrap_SyntaxReader_initLuaState in highlight_wrap.o
__wrap_new_RegexElement in highlight_wrap.o
...
"_PL_markstack_ptr", referenced from:
__wrap_DataDir_assocByExtension_set in highlight_wrap.o
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_set in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_set in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
__wrap_DataDir_initSearchDirectories in highlight_wrap.o
...
"_PL_stack_base", referenced from:
__wrap_DataDir_assocByExtension_set in highlight_wrap.o
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_set in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_set in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
__wrap_DataDir_initSearchDirectories in highlight_wrap.o
...
"_PL_stack_sp", referenced from:
__wrap_DataDir_assocByExtension_set in highlight_wrap.o
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_set in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_set in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
__wrap_DataDir_initSearchDirectories in highlight_wrap.o
...
"_PL_sv_immortals", referenced from:
__wrap_DataDir_getLangPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getSystemDataPath in highlight_wrap.o
__wrap_DataDir_getPluginPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_1 in highlight_wrap.o
SWIG_AsVal_bool(sv*, bool*) in highlight_wrap.o
...
"_Perl_croak", referenced from:
SWIG_croak_null() in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getLangPath in highlight_wrap.o
__wrap_DataDir_getSystemDataPath in highlight_wrap.o
__wrap_DataDir_getPluginPath__SWIG_0 in highlight_wrap.o
...
"_Perl_get_sv", referenced from:
__wrap_DataDir_assocByExtension_set in highlight_wrap.o
SWIG_croak_null() in highlight_wrap.o
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_set in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_set in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
...
"_Perl_gv_add_by_type", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_gv_init_pvn", referenced from:
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_hv_common", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_hv_common_key_len", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_markstack_grow", referenced from:
__wrap_DataDir_getLangPath in highlight_wrap.o
__wrap_DataDir_getThemePath in highlight_wrap.o
__wrap_DataDir_getFiletypesConfPath in highlight_wrap.o
__wrap_DataDir_getPluginPath in highlight_wrap.o
__wrap_DataDir_guessFileType in highlight_wrap.o
__wrap_SyntaxReader_initLuaState in highlight_wrap.o
__wrap_new_RegexElement in highlight_wrap.o
...
"_Perl_mg_find", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
_boot_highlight in highlight_wrap.o
"_Perl_mg_get", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
SWIG_AsVal_bool(sv*, bool*) in highlight_wrap.o
"_Perl_newRV_noinc", referenced from:
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_newSV", referenced from:
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_newSV_type", referenced from:
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_newSViv", referenced from:
__wrap_SyntaxReader_load in highlight_wrap.o
__wrap_SyntaxReader_getKeywordListGroup in highlight_wrap.o
__wrap_SyntaxReader_getPersistentSnippetsNum in highlight_wrap.o
__wrap_SyntaxReader_getOpenDelimiterID in highlight_wrap.o
__wrap_RegexElement_open_get in highlight_wrap.o
__wrap_RegexElement_end_get in highlight_wrap.o
__wrap_RegexElement_capturingGroup_get in highlight_wrap.o
...
"_Perl_newSVuv", referenced from:
__wrap_SyntaxReader_getRawStringPrefix in highlight_wrap.o
__wrap_SyntaxReader_getContinuationChar in highlight_wrap.o
__wrap_RegexElement_kwClass_get in highlight_wrap.o
__wrap_RegexElement_priority_get in highlight_wrap.o
__wrap_RegexElement_constraintLineNum_get in highlight_wrap.o
__wrap_ReGroup_length_get in highlight_wrap.o
__wrap_ReGroup_kwClass_get in highlight_wrap.o
...
"_Perl_newXS", referenced from:
_boot_highlight in highlight_wrap.o
"_Perl_sv_2bool_flags", referenced from:
SWIG_AsVal_bool(sv*, bool*) in highlight_wrap.o
"_Perl_sv_2iv_flags", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
SWIG_AsVal_unsigned_SS_int(sv*, unsigned int*) in highlight_wrap.o
_boot_highlight in highlight_wrap.o
SWIG_AsVal_long(sv*, long*) in highlight_wrap.o
SWIG_AsVal_double(sv*, double*) in highlight_wrap.o
"_Perl_sv_2mortal", referenced from:
__wrap_SyntaxReader_load in highlight_wrap.o
__wrap_SyntaxReader_getRawStringPrefix in highlight_wrap.o
__wrap_SyntaxReader_getContinuationChar in highlight_wrap.o
__wrap_SyntaxReader_getKeywordListGroup in highlight_wrap.o
__wrap_SyntaxReader_getPersistentSnippetsNum in highlight_wrap.o
__wrap_SyntaxReader_getOpenDelimiterID in highlight_wrap.o
__wrap_RegexElement_open_get in highlight_wrap.o
...
"_Perl_sv_2nv_flags", referenced from:
SWIG_AsVal_double(sv*, double*) in highlight_wrap.o
"_Perl_sv_2pv_flags", referenced from:
SWIG_croak_null() in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getSystemDataPath in highlight_wrap.o
__wrap_DataDir_getPluginPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_1 in highlight_wrap.o
...
"_Perl_sv_2uv_flags", referenced from:
SWIG_AsVal_unsigned_SS_int(sv*, unsigned int*) in highlight_wrap.o
SWIG_AsVal_long(sv*, long*) in highlight_wrap.o
"_Perl_sv_bless", referenced from:
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_sv_free2", referenced from:
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_sv_isobject", referenced from:
SWIG_Perl_ConvertPtr(sv*, void**, swig_type_info*, int) in highlight_wrap.o
SWIG_croak_null() in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getSystemDataPath in highlight_wrap.o
__wrap_DataDir_getPluginPath__SWIG_0 in highlight_wrap.o
...
"_Perl_sv_magic", referenced from:
_boot_highlight in highlight_wrap.o
SWIG_Perl_MakePtr(sv*, void*, swig_type_info*, int) in highlight_wrap.o
"_Perl_sv_newmortal", referenced from:
__wrap_DataDir_assocByExtension_set in highlight_wrap.o
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_set in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_set in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
__wrap_DataDir_initSearchDirectories in highlight_wrap.o
...
"_Perl_sv_setiv", referenced from:
_boot_highlight in highlight_wrap.o
"_Perl_sv_setpvf", referenced from:
__wrap_DataDir_assocByExtension_set in highlight_wrap.o
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_set in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_set in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
__wrap_DataDir_initSearchDirectories in highlight_wrap.o
...
"_Perl_sv_setpvn", referenced from:
__wrap_DataDir_getLangPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getSystemDataPath in highlight_wrap.o
__wrap_DataDir_getPluginPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_2 in highlight_wrap.o
...
"_Perl_sv_setref_pv", referenced from:
__wrap_DataDir_assocByExtension_get in highlight_wrap.o
__wrap_DataDir_assocByFilename_get in highlight_wrap.o
__wrap_DataDir_assocByShebang_get in highlight_wrap.o
__wrap_SyntaxReader_getKeywords in highlight_wrap.o
__wrap_SyntaxReader_getKeywordClasses in highlight_wrap.o
__wrap_SyntaxReader_getRegexElements in highlight_wrap.o
__wrap_SyntaxReader_getPersistentSnippets in highlight_wrap.o
...
"_Perl_sv_setsv_flags", referenced from:
__wrap_DataDir_getLangPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getLangPath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getSystemDataPath in highlight_wrap.o
__wrap_DataDir_getPluginPath__SWIG_0 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_1 in highlight_wrap.o
__wrap_DataDir_getThemePath__SWIG_2 in highlight_wrap.o
...
ld: symbol(s) not found for architecture x86_64
clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
This change adds a checkInstallPhase which runs a couple of queries
to smoke-test the ripgrep-all adapters. The queries are intended to
ensure that the dependencies needed by the adapters are included in
the package's dependencies.
We have updated python-slugify to 4.0.0 (or newer) which broke the
build. This has happened several times before without actually
breaking the software.
So yeah, lets just accept newer versions and fix it if it breaks for
some other reason in the future.
* recode: pname-ify
* recode: 3.7-* -> 3.7.2, new home
gnu homepage still exists (for now),
but links to the github repo we switch to :).
* recode: use pre-generated tarball to avoid gen, fix
* recode: 3.7.2 -> 3.7.4
https://github.com/rrthomas/recode/blob/v3.7.4/NEWS
(3.7.3 notes as well)
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.
Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.
The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
