diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/crs-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/galmon.nix | 2 | ||||
| -rw-r--r-- | pkgs/glitchtip.nix | 2 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 37 | ||||
| -rw-r--r-- | pkgs/patches/akkoma-fe-toki-pona.patch | 58 | ||||
| -rw-r--r-- | pkgs/patches/akkoma-toki-pona.patch | 20 | ||||
| -rw-r--r-- | pkgs/patches/cgit-main-instead-of-master.patch | 25 | ||||
| -rw-r--r-- | pkgs/patches/crs-tools-add-lockfile.patch (renamed from pkgs/crs-tools-add-lockfile.patch) | 0 | ||||
| -rw-r--r-- | pkgs/patches/galmon-fix-linker.patch (renamed from pkgs/galmon.patch) | 0 | ||||
| -rw-r--r-- | pkgs/patches/glitchtip-fix-poetry-name.patch (renamed from pkgs/glitchtip-fix-poetry-name.patch) | 0 | ||||
| -rw-r--r-- | pkgs/patches/hikari-gtk4.patch (renamed from pkgs/hikari-gtk4.patch) | 0 | ||||
| -rw-r--r-- | pkgs/patches/radicle-remove-curl-script.patch (renamed from pkgs/radicle-remove-curl-script.patch) | 0 | ||||
| -rw-r--r-- | pkgs/patches/rustex-cargo.lock (renamed from pkgs/rustex-cargo.lock) | 0 | ||||
| -rw-r--r-- | pkgs/radicle.nix | 2 |
14 files changed, 131 insertions, 17 deletions
diff --git a/pkgs/crs-tools.nix b/pkgs/crs-tools.nix index 4993b53..07032b8 100644 --- a/pkgs/crs-tools.nix +++ b/pkgs/crs-tools.nix @@ -27,7 +27,7 @@ rec { }; patches = [ - ./crs-tools-add-lockfile.patch + ./patches/crs-tools-add-lockfile.patch ]; buildInputs = [ php php.packages.composer ]; diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix index 9331e37..be6b89e 100644 --- a/pkgs/galmon.nix +++ b/pkgs/galmon.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ ./galmon.patch ]; + patches = [ ./patches/galmon-fix-linker.patch ]; buildInputs = [ protobuf pkg-config h2o openssl eigen ncurses5 zstd zlib curl gitMinimal abseil-cpp diff --git a/pkgs/glitchtip.nix b/pkgs/glitchtip.nix index dcecd0e..cdd832a 100644 --- a/pkgs/glitchtip.nix +++ b/pkgs/glitchtip.nix @@ -18,7 +18,7 @@ let projectDir = src; patches = [ - ./glitchtip-fix-poetry-name.patch + ./patches/glitchtip-fix-poetry-name.patch ]; # a bunch of python packages seem to misdeclare their dependencies diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index f38e7e0..ae1741b 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -12,12 +12,11 @@ let in { beamPackages = super.beam.packagesWith self.erlang; - elixir = self.beamPackages.elixir_1_14; + elixir = self.beamPackages.elixir; erlang = super.erlang_nox; inherit (unstable) lean4; - #### packages which are actually in use somewhere #### galmon-core = self.callPackage ./galmon.nix {}; @@ -25,7 +24,19 @@ in hikari = super.hikari.overrideAttrs (old: { makeFlags = old.makeFlags ++ [ "DEBUG=YES" ]; - patches = [ ./hikari-gtk4.patch ]; + patches = [ ./patches/hikari-gtk4.patch ]; + }); + + akkoma-fe = super.akkoma-frontends.akkoma-fe.overrideAttrs (old: { + patches = [ ./patches/akkoma-fe-toki-pona.patch ]; + }); + + akkoma = super.akkoma.overrideAttrs (old: { + patches = [ ./patches/akkoma-toki-pona.patch ]; + }); + + cgit = super.cgit.overrideAttrs (old: { + patches = [ ./patches/cgit-main-instead-of-master.patch ]; }); almanac = self.rustPlatform.buildRustPackage rec { @@ -44,11 +55,10 @@ in rev = "74f9d13d4a88e32a32c5d8b10e5ae1a2442a7a92"; sha256 = "sha256-SOnqb/ptMoPI+G96nI/dQHOsvjlaDa6YSBEjy77kRdY="; }}/rustex"; - # patches = [ ./rustex.patch ]; postPatch = '' - ln -s ${./rustex-cargo.lock} Cargo.lock + ln -s ${./patches/rustex-cargo.lock} Cargo.lock ''; - cargoLock.lockFile = ./rustex-cargo.lock; + cargoLock.lockFile = ./patches/rustex-cargo.lock; doCheck = false; }; @@ -146,13 +156,14 @@ in }); }); - glitchtip = (self.callPackage ./glitchtip.nix { - python = super.python310.override ({ - packageOverrides = self: super: { - django = super.django_4; - }; - }); - }); + # currently broken because poetry2nix was moved out of nixpkgs + # glitchtip = (self.callPackage ./glitchtip.nix { + # python = super.python310.override ({ + # packageOverrides = self: super: { + # django = super.django_4; + # }; + # }); + # }); crs-tracker = crs-tools.tracker; crs-php = crs-tools.php; diff --git a/pkgs/patches/akkoma-fe-toki-pona.patch b/pkgs/patches/akkoma-fe-toki-pona.patch new file mode 100644 index 0000000..281fdfc --- /dev/null +++ b/pkgs/patches/akkoma-fe-toki-pona.patch @@ -0,0 +1,58 @@ +From 122d6048355112c9b3c5858f03424416460675e1 Mon Sep 17 00:00:00 2001 +From: stuebinm <stuebinm@disroot.org> +Date: Fri, 23 Jun 2023 01:56:43 +0200 +Subject: [PATCH] mi la, toki pona li pona a + +--- + src/components/post_status_form/post_status_form.js | 2 +- + src/services/locale/locale.service.js | 8 +++++--- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js +index 5647a9eb..25180ba9 100644 +--- a/src/components/post_status_form/post_status_form.js ++++ b/src/components/post_status_form/post_status_form.js +@@ -303,7 +303,7 @@ const PostStatusForm = { + mobileLayout: state => state.interface.mobileLayout + }), + isoLanguages () { +- return iso6391.getAllCodes(); ++ return iso6391.getAllCodes().concat(['tok']); + } + }, + watch: { +diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js +index 8cef2522..8bee6ad2 100644 +--- a/src/services/locale/locale.service.js ++++ b/src/services/locale/locale.service.js +@@ -5,7 +5,8 @@ import _ from 'lodash' + const specialLanguageCodes = { + 'ja_easy': 'ja', + 'zh_Hant': 'zh-HANT', +- 'zh': 'zh-Hans' ++ 'zh': 'zh-Hans', ++ 'tok': 'tok' + } + + const internalToBrowserLocale = code => specialLanguageCodes[code] || code +@@ -16,14 +17,15 @@ const getLanguageName = (code) => { + const specialLanguageNames = { + 'ja_easy': 'やさしいにほんご', + 'zh': '简体中文', +- 'zh_Hant': '繁體中文' ++ 'zh_Hant': '繁體中文', ++ 'tok': 'Toki Pona' + } + const languageName = specialLanguageNames[code] || ISO6391.getNativeName(code) + const browserLocale = internalToBrowserLocale(code) + return languageName.charAt(0).toLocaleUpperCase(browserLocale) + languageName.slice(1) + } + +-const languages = _.map(languagesObject.languages, (code) => ({ code: code, name: getLanguageName(code) })).sort((a, b) => a.name.localeCompare(b.name)) ++const languages = _.map(languagesObject.languages.concat(['tok']), (code) => ({ code: code, name: getLanguageName(code) })).sort((a, b) => a.name.localeCompare(b.name)) + + const localeService = { + internalToBrowserLocale, +-- +2.40.1 + diff --git a/pkgs/patches/akkoma-toki-pona.patch b/pkgs/patches/akkoma-toki-pona.patch new file mode 100644 index 0000000..4cff3fa --- /dev/null +++ b/pkgs/patches/akkoma-toki-pona.patch @@ -0,0 +1,20 @@ +From 5fe3e614581c29daac6d4c70b000555ebe508c37 Mon Sep 17 00:00:00 2001 +From: stuebinm <stuebinm@disroot.org> +Date: Fri, 23 Jun 2023 01:41:55 +0200 +Subject: [PATCH] toki pona li pona + +--- + priv/language-codes.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/priv/language-codes.json b/priv/language-codes.json +index dda9a2b75..7967fdecf 100644 +--- a/priv/language-codes.json ++++ b/priv/language-codes.json +@@ -1,1 +1,1 @@ +-[{"English": "Afar", "alpha2": "aa"},{"English": "Abkhazian", "alpha2": "ab"},{"English": "Avestan", "alpha2": "ae"},{"English": "Afrikaans", "alpha2": "af"},{"English": "Akan", "alpha2": "ak"},{"English": "Amharic", "alpha2": "am"},{"English": "Aragonese", "alpha2": "an"},{"English": "Arabic", "alpha2": "ar"},{"English": "Assamese", "alpha2": "as"},{"English": "Avaric", "alpha2": "av"},{"English": "Aymara", "alpha2": "ay"},{"English": "Azerbaijani", "alpha2": "az"},{"English": "Bashkir", "alpha2": "ba"},{"English": "Belarusian", "alpha2": "be"},{"English": "Bulgarian", "alpha2": "bg"},{"English": "Bihari languages", "alpha2": "bh"},{"English": "Bislama", "alpha2": "bi"},{"English": "Bambara", "alpha2": "bm"},{"English": "Bengali", "alpha2": "bn"},{"English": "Tibetan", "alpha2": "bo"},{"English": "Breton", "alpha2": "br"},{"English": "Bosnian", "alpha2": "bs"},{"English": "Catalan; Valencian", "alpha2": "ca"},{"English": "Chechen", "alpha2": "ce"},{"English": "Chamorro", "alpha2": "ch"},{"English": "Corsican", "alpha2": "co"},{"English": "Cree", "alpha2": "cr"},{"English": "Czech", "alpha2": "cs"},{"English": "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic", "alpha2": "cu"},{"English": "Chuvash", "alpha2": "cv"},{"English": "Welsh", "alpha2": "cy"},{"English": "Danish", "alpha2": "da"},{"English": "German", "alpha2": "de"},{"English": "Divehi; Dhivehi; Maldivian", "alpha2": "dv"},{"English": "Dzongkha", "alpha2": "dz"},{"English": "Ewe", "alpha2": "ee"},{"English": "Greek, Modern (1453-)", "alpha2": "el"},{"English": "English", "alpha2": "en"},{"English": "Esperanto", "alpha2": "eo"},{"English": "Spanish; Castilian", "alpha2": "es"},{"English": "Estonian", "alpha2": "et"},{"English": "Basque", "alpha2": "eu"},{"English": "Persian", "alpha2": "fa"},{"English": "Fulah", "alpha2": "ff"},{"English": "Finnish", "alpha2": "fi"},{"English": "Fijian", "alpha2": "fj"},{"English": "Faroese", "alpha2": "fo"},{"English": "French", "alpha2": "fr"},{"English": "Western Frisian", "alpha2": "fy"},{"English": "Irish", "alpha2": "ga"},{"English": "Gaelic; Scottish Gaelic", "alpha2": "gd"},{"English": "Galician", "alpha2": "gl"},{"English": "Guarani", "alpha2": "gn"},{"English": "Gujarati", "alpha2": "gu"},{"English": "Manx", "alpha2": "gv"},{"English": "Hausa", "alpha2": "ha"},{"English": "Hebrew", "alpha2": "he"},{"English": "Hindi", "alpha2": "hi"},{"English": "Hiri Motu", "alpha2": "ho"},{"English": "Croatian", "alpha2": "hr"},{"English": "Haitian; Haitian Creole", "alpha2": "ht"},{"English": "Hungarian", "alpha2": "hu"},{"English": "Armenian", "alpha2": "hy"},{"English": "Herero", "alpha2": "hz"},{"English": "Interlingua (International Auxiliary Language Association)", "alpha2": "ia"},{"English": "Indonesian", "alpha2": "id"},{"English": "Interlingue; Occidental", "alpha2": "ie"},{"English": "Igbo", "alpha2": "ig"},{"English": "Sichuan Yi; Nuosu", "alpha2": "ii"},{"English": "Inupiaq", "alpha2": "ik"},{"English": "Ido", "alpha2": "io"},{"English": "Icelandic", "alpha2": "is"},{"English": "Italian", "alpha2": "it"},{"English": "Inuktitut", "alpha2": "iu"},{"English": "Japanese", "alpha2": "ja"},{"English": "Javanese", "alpha2": "jv"},{"English": "Georgian", "alpha2": "ka"},{"English": "Kongo", "alpha2": "kg"},{"English": "Kikuyu; Gikuyu", "alpha2": "ki"},{"English": "Kuanyama; Kwanyama", "alpha2": "kj"},{"English": "Kazakh", "alpha2": "kk"},{"English": "Kalaallisut; Greenlandic", "alpha2": "kl"},{"English": "Central Khmer", "alpha2": "km"},{"English": "Kannada", "alpha2": "kn"},{"English": "Korean", "alpha2": "ko"},{"English": "Kanuri", "alpha2": "kr"},{"English": "Kashmiri", "alpha2": "ks"},{"English": "Kurdish", "alpha2": "ku"},{"English": "Komi", "alpha2": "kv"},{"English": "Cornish", "alpha2": "kw"},{"English": "Kirghiz; Kyrgyz", "alpha2": "ky"},{"English": "Latin", "alpha2": "la"},{"English": "Luxembourgish; Letzeburgesch", "alpha2": "lb"},{"English": "Ganda", "alpha2": "lg"},{"English": "Limburgan; Limburger; Limburgish", "alpha2": "li"},{"English": "Lingala", "alpha2": "ln"},{"English": "Lao", "alpha2": "lo"},{"English": "Lithuanian", "alpha2": "lt"},{"English": "Luba-Katanga", "alpha2": "lu"},{"English": "Latvian", "alpha2": "lv"},{"English": "Malagasy", "alpha2": "mg"},{"English": "Marshallese", "alpha2": "mh"},{"English": "Maori", "alpha2": "mi"},{"English": "Macedonian", "alpha2": "mk"},{"English": "Malayalam", "alpha2": "ml"},{"English": "Mongolian", "alpha2": "mn"},{"English": "Marathi", "alpha2": "mr"},{"English": "Malay", "alpha2": "ms"},{"English": "Maltese", "alpha2": "mt"},{"English": "Burmese", "alpha2": "my"},{"English": "Nauru", "alpha2": "na"},{"English": "Bokm\u00e5l, Norwegian; Norwegian Bokm\u00e5l", "alpha2": "nb"},{"English": "Ndebele, North; North Ndebele", "alpha2": "nd"},{"English": "Nepali", "alpha2": "ne"},{"English": "Ndonga", "alpha2": "ng"},{"English": "Dutch; Flemish", "alpha2": "nl"},{"English": "Norwegian Nynorsk; Nynorsk, Norwegian", "alpha2": "nn"},{"English": "Norwegian", "alpha2": "no"},{"English": "Ndebele, South; South Ndebele", "alpha2": "nr"},{"English": "Navajo; Navaho", "alpha2": "nv"},{"English": "Chichewa; Chewa; Nyanja", "alpha2": "ny"},{"English": "Occitan (post 1500)", "alpha2": "oc"},{"English": "Ojibwa", "alpha2": "oj"},{"English": "Oromo", "alpha2": "om"},{"English": "Oriya", "alpha2": "or"},{"English": "Ossetian; Ossetic", "alpha2": "os"},{"English": "Panjabi; Punjabi", "alpha2": "pa"},{"English": "Pali", "alpha2": "pi"},{"English": "Polish", "alpha2": "pl"},{"English": "Pushto; Pashto", "alpha2": "ps"},{"English": "Portuguese", "alpha2": "pt"},{"English": "Quechua", "alpha2": "qu"},{"English": "Romansh", "alpha2": "rm"},{"English": "Rundi", "alpha2": "rn"},{"English": "Romanian; Moldavian; Moldovan", "alpha2": "ro"},{"English": "Russian", "alpha2": "ru"},{"English": "Kinyarwanda", "alpha2": "rw"},{"English": "Sanskrit", "alpha2": "sa"},{"English": "Sardinian", "alpha2": "sc"},{"English": "Sindhi", "alpha2": "sd"},{"English": "Northern Sami", "alpha2": "se"},{"English": "Sango", "alpha2": "sg"},{"English": "Sinhala; Sinhalese", "alpha2": "si"},{"English": "Slovak", "alpha2": "sk"},{"English": "Slovenian", "alpha2": "sl"},{"English": "Samoan", "alpha2": "sm"},{"English": "Shona", "alpha2": "sn"},{"English": "Somali", "alpha2": "so"},{"English": "Albanian", "alpha2": "sq"},{"English": "Serbian", "alpha2": "sr"},{"English": "Swati", "alpha2": "ss"},{"English": "Sotho, Southern", "alpha2": "st"},{"English": "Sundanese", "alpha2": "su"},{"English": "Swedish", "alpha2": "sv"},{"English": "Swahili", "alpha2": "sw"},{"English": "Tamil", "alpha2": "ta"},{"English": "Telugu", "alpha2": "te"},{"English": "Tajik", "alpha2": "tg"},{"English": "Thai", "alpha2": "th"},{"English": "Tigrinya", "alpha2": "ti"},{"English": "Turkmen", "alpha2": "tk"},{"English": "Tagalog", "alpha2": "tl"},{"English": "Tswana", "alpha2": "tn"},{"English": "Tonga (Tonga Islands)", "alpha2": "to"},{"English": "Turkish", "alpha2": "tr"},{"English": "Tsonga", "alpha2": "ts"},{"English": "Tatar", "alpha2": "tt"},{"English": "Twi", "alpha2": "tw"},{"English": "Tahitian", "alpha2": "ty"},{"English": "Uighur; Uyghur", "alpha2": "ug"},{"English": "Ukrainian", "alpha2": "uk"},{"English": "Urdu", "alpha2": "ur"},{"English": "Uzbek", "alpha2": "uz"},{"English": "Venda", "alpha2": "ve"},{"English": "Vietnamese", "alpha2": "vi"},{"English": "Volap\u00fck", "alpha2": "vo"},{"English": "Walloon", "alpha2": "wa"},{"English": "Wolof", "alpha2": "wo"},{"English": "Xhosa", "alpha2": "xh"},{"English": "Yiddish", "alpha2": "yi"},{"English": "Yoruba", "alpha2": "yo"},{"English": "Zhuang; Chuang", "alpha2": "za"},{"English": "Chinese", "alpha2": "zh"},{"English": "Zulu", "alpha2": "zu"}] +\ No newline at end of file ++[{"English":"Toki Pona","alpha2":"tok"},{"English": "Afar", "alpha2": "aa"},{"English": "Abkhazian", "alpha2": "ab"},{"English": "Avestan", "alpha2": "ae"},{"English": "Afrikaans", "alpha2": "af"},{"English": "Akan", "alpha2": "ak"},{"English": "Amharic", "alpha2": "am"},{"English": "Aragonese", "alpha2": "an"},{"English": "Arabic", "alpha2": "ar"},{"English": "Assamese", "alpha2": "as"},{"English": "Avaric", "alpha2": "av"},{"English": "Aymara", "alpha2": "ay"},{"English": "Azerbaijani", "alpha2": "az"},{"English": "Bashkir", "alpha2": "ba"},{"English": "Belarusian", "alpha2": "be"},{"English": "Bulgarian", "alpha2": "bg"},{"English": "Bihari languages", "alpha2": "bh"},{"English": "Bislama", "alpha2": "bi"},{"English": "Bambara", "alpha2": "bm"},{"English": "Bengali", "alpha2": "bn"},{"English": "Tibetan", "alpha2": "bo"},{"English": "Breton", "alpha2": "br"},{"English": "Bosnian", "alpha2": "bs"},{"English": "Catalan; Valencian", "alpha2": "ca"},{"English": "Chechen", "alpha2": "ce"},{"English": "Chamorro", "alpha2": "ch"},{"English": "Corsican", "alpha2": "co"},{"English": "Cree", "alpha2": "cr"},{"English": "Czech", "alpha2": "cs"},{"English": "Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic", "alpha2": "cu"},{"English": "Chuvash", "alpha2": "cv"},{"English": "Welsh", "alpha2": "cy"},{"English": "Danish", "alpha2": "da"},{"English": "German", "alpha2": "de"},{"English": "Divehi; Dhivehi; Maldivian", "alpha2": "dv"},{"English": "Dzongkha", "alpha2": "dz"},{"English": "Ewe", "alpha2": "ee"},{"English": "Greek, Modern (1453-)", "alpha2": "el"},{"English": "English", "alpha2": "en"},{"English": "Esperanto", "alpha2": "eo"},{"English": "Spanish; Castilian", "alpha2": "es"},{"English": "Estonian", "alpha2": "et"},{"English": "Basque", "alpha2": "eu"},{"English": "Persian", "alpha2": "fa"},{"English": "Fulah", "alpha2": "ff"},{"English": "Finnish", "alpha2": "fi"},{"English": "Fijian", "alpha2": "fj"},{"English": "Faroese", "alpha2": "fo"},{"English": "French", "alpha2": "fr"},{"English": "Western Frisian", "alpha2": "fy"},{"English": "Irish", "alpha2": "ga"},{"English": "Gaelic; Scottish Gaelic", "alpha2": "gd"},{"English": "Galician", "alpha2": "gl"},{"English": "Guarani", "alpha2": "gn"},{"English": "Gujarati", "alpha2": "gu"},{"English": "Manx", "alpha2": "gv"},{"English": "Hausa", "alpha2": "ha"},{"English": "Hebrew", "alpha2": "he"},{"English": "Hindi", "alpha2": "hi"},{"English": "Hiri Motu", "alpha2": "ho"},{"English": "Croatian", "alpha2": "hr"},{"English": "Haitian; Haitian Creole", "alpha2": "ht"},{"English": "Hungarian", "alpha2": "hu"},{"English": "Armenian", "alpha2": "hy"},{"English": "Herero", "alpha2": "hz"},{"English": "Interlingua (International Auxiliary Language Association)", "alpha2": "ia"},{"English": "Indonesian", "alpha2": "id"},{"English": "Interlingue; Occidental", "alpha2": "ie"},{"English": "Igbo", "alpha2": "ig"},{"English": "Sichuan Yi; Nuosu", "alpha2": "ii"},{"English": "Inupiaq", "alpha2": "ik"},{"English": "Ido", "alpha2": "io"},{"English": "Icelandic", "alpha2": "is"},{"English": "Italian", "alpha2": "it"},{"English": "Inuktitut", "alpha2": "iu"},{"English": "Japanese", "alpha2": "ja"},{"English": "Javanese", "alpha2": "jv"},{"English": "Georgian", "alpha2": "ka"},{"English": "Kongo", "alpha2": "kg"},{"English": "Kikuyu; Gikuyu", "alpha2": "ki"},{"English": "Kuanyama; Kwanyama", "alpha2": "kj"},{"English": "Kazakh", "alpha2": "kk"},{"English": "Kalaallisut; Greenlandic", "alpha2": "kl"},{"English": "Central Khmer", "alpha2": "km"},{"English": "Kannada", "alpha2": "kn"},{"English": "Korean", "alpha2": "ko"},{"English": "Kanuri", "alpha2": "kr"},{"English": "Kashmiri", "alpha2": "ks"},{"English": "Kurdish", "alpha2": "ku"},{"English": "Komi", "alpha2": "kv"},{"English": "Cornish", "alpha2": "kw"},{"English": "Kirghiz; Kyrgyz", "alpha2": "ky"},{"English": "Latin", "alpha2": "la"},{"English": "Luxembourgish; Letzeburgesch", "alpha2": "lb"},{"English": "Ganda", "alpha2": "lg"},{"English": "Limburgan; Limburger; Limburgish", "alpha2": "li"},{"English": "Lingala", "alpha2": "ln"},{"English": "Lao", "alpha2": "lo"},{"English": "Lithuanian", "alpha2": "lt"},{"English": "Luba-Katanga", "alpha2": "lu"},{"English": "Latvian", "alpha2": "lv"},{"English": "Malagasy", "alpha2": "mg"},{"English": "Marshallese", "alpha2": "mh"},{"English": "Maori", "alpha2": "mi"},{"English": "Macedonian", "alpha2": "mk"},{"English": "Malayalam", "alpha2": "ml"},{"English": "Mongolian", "alpha2": "mn"},{"English": "Marathi", "alpha2": "mr"},{"English": "Malay", "alpha2": "ms"},{"English": "Maltese", "alpha2": "mt"},{"English": "Burmese", "alpha2": "my"},{"English": "Nauru", "alpha2": "na"},{"English": "Bokm\u00e5l, Norwegian; Norwegian Bokm\u00e5l", "alpha2": "nb"},{"English": "Ndebele, North; North Ndebele", "alpha2": "nd"},{"English": "Nepali", "alpha2": "ne"},{"English": "Ndonga", "alpha2": "ng"},{"English": "Dutch; Flemish", "alpha2": "nl"},{"English": "Norwegian Nynorsk; Nynorsk, Norwegian", "alpha2": "nn"},{"English": "Norwegian", "alpha2": "no"},{"English": "Ndebele, South; South Ndebele", "alpha2": "nr"},{"English": "Navajo; Navaho", "alpha2": "nv"},{"English": "Chichewa; Chewa; Nyanja", "alpha2": "ny"},{"English": "Occitan (post 1500)", "alpha2": "oc"},{"English": "Ojibwa", "alpha2": "oj"},{"English": "Oromo", "alpha2": "om"},{"English": "Oriya", "alpha2": "or"},{"English": "Ossetian; Ossetic", "alpha2": "os"},{"English": "Panjabi; Punjabi", "alpha2": "pa"},{"English": "Pali", "alpha2": "pi"},{"English": "Polish", "alpha2": "pl"},{"English": "Pushto; Pashto", "alpha2": "ps"},{"English": "Portuguese", "alpha2": "pt"},{"English": "Quechua", "alpha2": "qu"},{"English": "Romansh", "alpha2": "rm"},{"English": "Rundi", "alpha2": "rn"},{"English": "Romanian; Moldavian; Moldovan", "alpha2": "ro"},{"English": "Russian", "alpha2": "ru"},{"English": "Kinyarwanda", "alpha2": "rw"},{"English": "Sanskrit", "alpha2": "sa"},{"English": "Sardinian", "alpha2": "sc"},{"English": "Sindhi", "alpha2": "sd"},{"English": "Northern Sami", "alpha2": "se"},{"English": "Sango", "alpha2": "sg"},{"English": "Sinhala; Sinhalese", "alpha2": "si"},{"English": "Slovak", "alpha2": "sk"},{"English": "Slovenian", "alpha2": "sl"},{"English": "Samoan", "alpha2": "sm"},{"English": "Shona", "alpha2": "sn"},{"English": "Somali", "alpha2": "so"},{"English": "Albanian", "alpha2": "sq"},{"English": "Serbian", "alpha2": "sr"},{"English": "Swati", "alpha2": "ss"},{"English": "Sotho, Southern", "alpha2": "st"},{"English": "Sundanese", "alpha2": "su"},{"English": "Swedish", "alpha2": "sv"},{"English": "Swahili", "alpha2": "sw"},{"English": "Tamil", "alpha2": "ta"},{"English": "Telugu", "alpha2": "te"},{"English": "Tajik", "alpha2": "tg"},{"English": "Thai", "alpha2": "th"},{"English": "Tigrinya", "alpha2": "ti"},{"English": "Turkmen", "alpha2": "tk"},{"English": "Tagalog", "alpha2": "tl"},{"English": "Tswana", "alpha2": "tn"},{"English": "Tonga (Tonga Islands)", "alpha2": "to"},{"English": "Turkish", "alpha2": "tr"},{"English": "Tsonga", "alpha2": "ts"},{"English": "Tatar", "alpha2": "tt"},{"English": "Twi", "alpha2": "tw"},{"English": "Tahitian", "alpha2": "ty"},{"English": "Uighur; Uyghur", "alpha2": "ug"},{"English": "Ukrainian", "alpha2": "uk"},{"English": "Urdu", "alpha2": "ur"},{"English": "Uzbek", "alpha2": "uz"},{"English": "Venda", "alpha2": "ve"},{"English": "Vietnamese", "alpha2": "vi"},{"English": "Volap\u00fck", "alpha2": "vo"},{"English": "Walloon", "alpha2": "wa"},{"English": "Wolof", "alpha2": "wo"},{"English": "Xhosa", "alpha2": "xh"},{"English": "Yiddish", "alpha2": "yi"},{"English": "Yoruba", "alpha2": "yo"},{"English": "Zhuang; Chuang", "alpha2": "za"},{"English": "Chinese", "alpha2": "zh"},{"English": "Zulu", "alpha2": "zu"}] +-- +2.40.1 + diff --git a/pkgs/patches/cgit-main-instead-of-master.patch b/pkgs/patches/cgit-main-instead-of-master.patch new file mode 100644 index 0000000..21f6b00 --- /dev/null +++ b/pkgs/patches/cgit-main-instead-of-master.patch @@ -0,0 +1,25 @@ +From 9f4e165702819bdab78403e4145db517b915df95 Mon Sep 17 00:00:00 2001 +From: stuebinm <stuebinm@disroot.org> +Date: Wed, 14 Sep 2022 15:08:32 +0200 +Subject: [PATCH] main instead of master branch + +--- + cgit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cgit.c b/cgit.c +index 08d81a1..5b0a016 100644 +--- a/cgit.c ++++ b/cgit.c +@@ -489,7 +489,7 @@ static char *guess_defbranch(void) + + ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL); + if (!ref || !skip_prefix(ref, "refs/heads/", &refname)) +- return "master"; ++ return "main"; + return xstrdup(refname); + } + +-- +2.36.0 + diff --git a/pkgs/crs-tools-add-lockfile.patch b/pkgs/patches/crs-tools-add-lockfile.patch index a8cd3ce..a8cd3ce 100644 --- a/pkgs/crs-tools-add-lockfile.patch +++ b/pkgs/patches/crs-tools-add-lockfile.patch diff --git a/pkgs/galmon.patch b/pkgs/patches/galmon-fix-linker.patch index f53c504..f53c504 100644 --- a/pkgs/galmon.patch +++ b/pkgs/patches/galmon-fix-linker.patch diff --git a/pkgs/glitchtip-fix-poetry-name.patch b/pkgs/patches/glitchtip-fix-poetry-name.patch index 9cc82bd..9cc82bd 100644 --- a/pkgs/glitchtip-fix-poetry-name.patch +++ b/pkgs/patches/glitchtip-fix-poetry-name.patch diff --git a/pkgs/hikari-gtk4.patch b/pkgs/patches/hikari-gtk4.patch index 68d8cf1..68d8cf1 100644 --- a/pkgs/hikari-gtk4.patch +++ b/pkgs/patches/hikari-gtk4.patch diff --git a/pkgs/radicle-remove-curl-script.patch b/pkgs/patches/radicle-remove-curl-script.patch index ea8905d..ea8905d 100644 --- a/pkgs/radicle-remove-curl-script.patch +++ b/pkgs/patches/radicle-remove-curl-script.patch diff --git a/pkgs/rustex-cargo.lock b/pkgs/patches/rustex-cargo.lock index c26343b..c26343b 100644 --- a/pkgs/rustex-cargo.lock +++ b/pkgs/patches/rustex-cargo.lock diff --git a/pkgs/radicle.nix b/pkgs/radicle.nix index ff2ed8b..6a3ad9d 100644 --- a/pkgs/radicle.nix +++ b/pkgs/radicle.nix @@ -8,7 +8,7 @@ hash = "sha256-bdXsK01mLrz4g8rVlMQfZDB+p7ldMIsTJP7jfGeobkM="; }; - patches = [ ./radicle-remove-curl-script.patch ]; + patches = [ ./patches/radicle-remove-curl-script.patch ]; postPatch = '' patchShebangs scripts/* ${if config == null then "" else '' |