diff --git a/doc/configuration.xml b/doc/configuration.xml index 4411b4844e999f01b7379c8375b8c376ed39a09d..c91f38f309300b2c4d0b7686d46c3cd4961ac31c 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -378,7 +378,7 @@ myPackages = pkgs.buildEnv { name = "my-packages"; paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" /bin" ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; extraOutputsToInstall = [ "man" "doc" ]; }; }; @@ -416,7 +416,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh nox silver-searcher ]; - pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ]; + pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ]; extraOutputsToInstall = [ "man" "doc" ]; }; }; diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index ffa3a90b5eb610120a5330c68d60b83cc9b8aee7..6c6f808f631ec497f637cb2e40b431dd57ee0b45 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -476,7 +476,7 @@ Additional information. It's only for non-breaking mass-rebuild commits. That means it's not to be used for testing, and changes must have been well tested already. - Read + Read policy here. diff --git a/lib/default.nix b/lib/default.nix index 60ce01a93cd206f24e36eadb97a49c2ebb8611ff..4ca2e2ea6e372370d9149dd46b7e665b42c4cde6 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -51,11 +51,11 @@ let # back-compat aliases platforms = systems.forMeta; - inherit (builtins) add addErrorContext attrNames - concatLists deepSeq elem elemAt filter genericClosure genList - getAttr hasAttr head isAttrs isBool isInt isList - isString length lessThan listToAttrs pathExists readFile - replaceStrings seq stringLength sub substring tail; + inherit (builtins) add addErrorContext attrNames concatLists + deepSeq elem elemAt filter genericClosure genList getAttr + hasAttr head isAttrs isBool isInt isList isString length + lessThan listToAttrs pathExists readFile replaceStrings seq + stringLength sub substring tail; inherit (trivial) id const concat or and boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info nixpkgsVersion version mod compare splitByAndCompare @@ -74,30 +74,32 @@ let inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists - reverseList listDfs toposort sort naturalSort compareLists take drop sublist - last init crossLists unique intersectLists subtractLists - mutuallyExclusive; + reverseList listDfs toposort sort naturalSort compareLists take + drop sublist last init crossLists unique intersectLists + subtractLists mutuallyExclusive; inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath makePerlPath optionalString hasPrefix hasSuffix stringToCharacters stringAsChars escape - escapeShellArg escapeShellArgs replaceChars lowerChars upperChars - toLower toUpper addContextFrom splitString removePrefix - removeSuffix versionOlder versionAtLeast getVersion nameFromURL - enableFeature fixedWidthString fixedWidthNumber isStorePath + escapeShellArg escapeShellArgs replaceChars lowerChars + upperChars toLower toUpper addContextFrom splitString + removePrefix removeSuffix versionOlder versionAtLeast getVersion + nameFromURL enableFeature enableFeatureAs withFeature + withFeatureAs fixedWidthString fixedWidthNumber isStorePath toInt readPathsFromFile fileContents; inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith extendDerivation - hydraJob makeScope; + callPackageWith callPackagesWith extendDerivation hydraJob + makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices - commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource; + commitIdFromGitRepo cleanSourceWith pathHasContext + canCleanSource; inherit (modules) evalModules closeModules unifyModuleSyntax applyIfFunction unpackSubmodule packSubmodule mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions @@ -119,8 +121,7 @@ let traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 - traceValIfNot runTests testAllTrue traceCallXml - attrNamesToStr; + traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs defaultOverridableDelayableArgs composedArgsAndFun maybeAttrNullable maybeAttr ifEnable checkFlag getValue @@ -129,7 +130,7 @@ let closePropagation mapAttrsFlatten nvs setAttr setAttrMerge mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults - mergeAttrsByFuncDefaultsClean mergeAttrBy - prepareDerivationArgs nixType imap overridableDelayableArgs; + mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs + nixType imap overridableDelayableArgs; }); in lib diff --git a/lib/meta.nix b/lib/meta.nix index 8516cc1cd6f1b48d647cae36c2b3588a0b552059..199030c103af58031ec8243193d324c0b391a8c6 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -86,6 +86,4 @@ rec { then { system = elem; } else { parsed = elem; }; in lib.matchAttrs pattern platform; - - enableIfAvailable = p: if p.meta.available or true then [ p ] else []; } diff --git a/lib/modules.nix b/lib/modules.nix index 6c8033322a540d1c465540f6727a7f74a55733a6..8baae4917053872ecf97817cf268296aa91a4122 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -310,6 +310,7 @@ rec { in opt // { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; + inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; files = map (def: def.file) res.defsFinal; inherit (res) isDefined; @@ -317,7 +318,7 @@ rec { # Merge definitions of a value of a given type. mergeDefinitions = loc: type: defs: rec { - defsFinal = + defsFinal' = let # Process mkMerge and mkIf properties. defs' = concatMap (m: @@ -325,15 +326,20 @@ rec { ) defs; # Process mkOverride properties. - defs'' = filterOverrides defs'; + defs'' = filterOverrides' defs'; # Sort mkOrder properties. defs''' = # Avoid sorting if we don't have to. - if any (def: def.value._type or "" == "order") defs'' - then sortProperties defs'' - else defs''; - in defs'''; + if any (def: def.value._type or "" == "order") defs''.values + then sortProperties defs''.values + else defs''.values; + in { + values = defs'''; + inherit (defs'') highestPrio; + }; + + defsFinal = defsFinal'.values; # Type-check the remaining definitions, and merge them. mergedValue = foldl' (res: def: @@ -416,13 +422,18 @@ rec { Note that "z" has the default priority 100. */ - filterOverrides = defs: + filterOverrides = defs: (filterOverrides' defs).values; + + filterOverrides' = defs: let defaultPrio = 100; getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio; highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; - in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs; + in { + values = concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs; + inherit highestPrio; + }; /* Sort a list of properties. The sort priority of a property is 1000 by default, but can be overridden by wrapping the property @@ -664,6 +675,7 @@ rec { in { config, options, ... }: { options = setAttrByPath from (mkOption { + inherit visible; description = "Alias of ."; apply = x: use (toOf config); }); diff --git a/lib/strings.nix b/lib/strings.nix index e6df7d99cb2e196c15eafa509a27c0de0a0c8b52..e09ec42bfea23cd9448f8ab0ae652c45a8959e3a 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -82,7 +82,7 @@ rec { => "//bin" */ makeSearchPath = subDir: packages: - concatStringsSep ":" (map (path: path + "/" + subDir) packages); + concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages)); /* Construct a Unix-style search path, using given package output. If no output is found, fallback to `.out` and then to the default. @@ -414,6 +414,39 @@ rec { */ enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}"; + /* Create an --{enable-=,disable-} string that can be passed to + standard GNU Autoconf scripts. + + Example: + enableFeature true "shared" "foo" + => "--enable-shared=foo" + enableFeature false "shared" (throw "ignored") + => "--disable-shared" + */ + enableFeatureAs = enable: feat: value: enableFeature enable feat + optionalString enable "=${value}"; + + /* Create an --{with,without}- string that can be passed to + standard GNU Autoconf scripts. + + Example: + withFeature true "shared" + => "--with-shared" + withFeature false "shared" + => "--without-shared" + */ + withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}"; + + /* Create an --{with-=,without-} string that can be passed to + standard GNU Autoconf scripts. + + Example: + with_Feature true "shared" "foo" + => "--with-shared=foo" + with_Feature false "shared" (throw "ignored") + => "--without-shared" + */ + withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}"; + /* Create a fixed width string with additional prefix to match required width. diff --git a/lib/systems/default.nix b/lib/systems/default.nix index e7346a538d358c3e635666172d6be4e51af24f27..ee4c29660a554f7badce1e749bcaaa4f6668c96c 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -29,6 +29,7 @@ rec { /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" else if final.isMusl then "musl" + else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems @@ -49,5 +50,12 @@ rec { } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; + assert lib.foldl + (pass: { assertion, message }: + if assertion final + then pass + else throw message) + true + (final.parsed.abi.assertions or []); final; } diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index fdb120ebb5cbce65114109697aa0cf9ac3a48376..4c7dd9917919008f0f43e5fa36e337fa6ab16e42 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -11,36 +11,41 @@ rec { sheevaplug = rec { config = "armv5tel-unknown-linux-gnueabi"; - arch = "armv5tel"; - float = "soft"; platform = platforms.sheevaplug; }; raspberryPi = rec { config = "armv6l-unknown-linux-gnueabihf"; - arch = "armv6l"; - float = "hard"; - fpu = "vfp"; platform = platforms.raspberrypi; }; armv7l-hf-multiplatform = rec { - config = "arm-unknown-linux-gnueabihf"; - arch = "armv7-a"; - float = "hard"; - fpu = "vfpv3-d16"; + config = "armv7a-unknown-linux-gnueabihf"; platform = platforms.armv7l-hf-multiplatform; }; aarch64-multiplatform = rec { config = "aarch64-unknown-linux-gnu"; - arch = "aarch64"; platform = platforms.aarch64-multiplatform; }; + armv5te-android-prebuilt = rec { + config = "armv5tel-unknown-linux-androideabi"; + sdkVer = "21"; + platform = platforms.armv5te-android; + useAndroidPrebuilt = true; + }; + + armv7a-android-prebuilt = rec { + config = "armv7a-unknown-linux-androideabi"; + sdkVer = "21"; + platform = platforms.armv7a-android; + useAndroidPrebuilt = true; + }; + aarch64-android-prebuilt = rec { config = "aarch64-unknown-linux-android"; - arch = "aarch64"; + sdkVer = "24"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; @@ -51,16 +56,17 @@ rec { }; pogoplug4 = rec { - arch = "armv5tel"; config = "armv5tel-unknown-linux-gnueabi"; - float = "soft"; platform = platforms.pogoplug4; }; + ben-nanonote = rec { + config = "mipsel-unknown-linux-uclibc"; + platform = platforms.ben_nanonote; + }; + fuloongminipc = rec { config = "mipsel-unknown-linux-gnu"; - arch = "mips"; - float = "hard"; platform = platforms.fuloong2f_n32; }; @@ -128,7 +134,6 @@ rec { # 32 bit mingw-w64 mingw32 = { config = "i686-pc-mingw32"; - arch = "x86"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; @@ -137,7 +142,6 @@ rec { mingwW64 = { # That's the triplet they use in the mingw-w64 docs. config = "x86_64-pc-mingw32"; - arch = "x86_64"; # Irrelevant libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 63f9fab4f6755ed9c158dd8c44080bc269b410b1..c0c283469fe9a1d76443d5248f787e37e87c9620 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -3,6 +3,9 @@ with import ./parse.nix { inherit lib; }; with lib.attrsets; with lib.lists; +let abis_ = abis; in +let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in + rec { patterns = rec { isi686 = { cpu = cpuTypes.i686; }; @@ -38,6 +41,7 @@ rec { isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) [ "x86" "arm" "aarch64" ]; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 018fd172e6872ac653113d169b176248bb065e0c..d79947ad3dea3f3ed4fa6a8be75631731d30eb33 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -68,20 +68,31 @@ rec { cpuTypes = with significantBytes; setTypes types.openCpuType { arm = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; }; - armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; }; - aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; }; + armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; }; + armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; + armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; }; + armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; }; + armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; + armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; + armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; }; + aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; }; + i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; + mips = { bits = 32; significantByte = bigEndian; family = "mips"; }; mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; }; mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; }; mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; + riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; }; riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; + wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; }; @@ -184,17 +195,40 @@ rec { types.abi = enum (attrValues abis); abis = setTypes types.openAbi { - android = {}; - cygnus = {}; - gnu = {}; - msvc = {}; - eabi = {}; - androideabi = {}; - gnueabi = {}; - gnueabihf = {}; - musleabi = {}; - musleabihf = {}; - musl = {}; + cygnus = {}; + msvc = {}; + eabi = {}; + + androideabi = {}; + android = { + assertions = [ + { assertion = platform: !platform.isAarch32; + message = '' + The "android" ABI is not for 32-bit ARM. Use "androideabi" instead. + ''; + } + ]; + }; + + gnueabi = { float = "soft"; }; + gnueabihf = { float = "hard"; }; + gnu = { + assertions = [ + { assertion = platform: !platform.isAarch32; + message = '' + The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. + ''; + } + ]; + }; + + musleabi = { float = "soft"; }; + musleabihf = { float = "hard"; }; + musl = {}; + + uclibceabihf = { float = "soft"; }; + uclibceabi = { float = "hard"; }; + uclibc = {}; unknown = {}; }; @@ -261,7 +295,12 @@ rec { kernel = getKernel args.kernel; abi = /**/ if args ? abi then getAbi args.abi - else if isLinux parsed then abis.gnu + else if isLinux parsed then + if isAarch32 parsed then + if lib.versionAtLeast (parsed.cpu.version or "0") "6" + then abis.gnueabihf + else abis.gnueabi + else abis.gnu else if isWindows parsed then abis.gnu else abis.unknown; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index f39e890fbf1c968cfcfb5a95df1fdf05f623a83f..32f055b6b1c56df85de6de759be355c80bd258ae 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -20,12 +20,15 @@ rec { kernelAutoModules = false; }; + ## + ## ARM + ## + pogoplug4 = { name = "pogoplug4"; gcc = { arch = "armv5te"; - float = "soft"; }; kernelMajor = "2.6"; @@ -158,7 +161,6 @@ rec { kernelDTB = true; # Beyond 3.10 gcc = { arch = "armv5te"; - float = "soft"; }; }; @@ -243,7 +245,6 @@ rec { gcc = { arch = "armv6"; fpu = "vfp"; - float = "hard"; # TODO(@Ericson2314) what is this and is it a good idea? It was # used in some cross compilation examples but not others. # @@ -336,7 +337,6 @@ rec { gcc = { cpu = "cortex-a9"; fpu = "vfpv3"; - float = "hard"; }; }; @@ -363,7 +363,6 @@ rec { gcc = { cpu = "cortex-a9"; fpu = "neon"; - float = "hard"; }; }; @@ -376,83 +375,6 @@ rec { kernelBaseConfig = "guruplug_defconfig"; }; - fuloong2f_n32 = { - name = "fuloong2f_n32"; - kernelMajor = "2.6"; - kernelBaseConfig = "lemote2f_defconfig"; - kernelArch = "mips"; - kernelAutoModules = false; - kernelExtraConfig = '' - MIGRATION n - COMPACTION n - - # nixos mounts some cgroup - CGROUPS y - - BLK_DEV_RAM y - BLK_DEV_INITRD y - BLK_DEV_CRYPTOLOOP m - BLK_DEV_DM m - DM_CRYPT m - MD y - REISERFS_FS m - EXT4_FS m - USB_STORAGE_CYPRESS_ATACB m - - IP_PNP y - IP_PNP_DHCP y - IP_PNP_BOOTP y - NFS_FS y - ROOT_NFS y - TUN m - NFS_V4 y - NFS_V4_1 y - NFS_FSCACHE y - NFSD m - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - - # Fail to build - DRM n - SCSI_ADVANSYS n - USB_ISP1362_HCD n - SND_SOC n - SND_ALI5451 n - FB_SAVAGE n - SCSI_NSP32 n - ATA_SFF n - SUNGEM n - IRDA n - ATM_HE n - SCSI_ACARD n - BLK_DEV_CMD640_ENHANCED n - - FUSE_FS m - - # Needed for udev >= 150 - SYSFS_DEPRECATED_V2 n - - VGA_CONSOLE n - VT_HW_CONSOLE_BINDING y - SERIAL_8250_CONSOLE y - FRAMEBUFFER_CONSOLE y - EXT2_FS y - EXT3_FS y - REISERFS_FS y - MAGIC_SYSRQ y - - # The kernel doesn't boot at all, with FTRACE - FTRACE n - ''; - kernelTarget = "vmlinux"; - gcc = { - arch = "loongson2f"; - abi = "n32"; - }; - }; - beaglebone = armv7l-hf-multiplatform // { name = "beaglebone"; kernelBaseConfig = "bb.org_defconfig"; @@ -461,6 +383,27 @@ rec { kernelTarget = "zImage"; }; + # https://developer.android.com/ndk/guides/abis#armeabi + armv5te-android = { + name = "armeabi"; + gcc = { + arch = "armv5te"; + float = "soft"; + float-abi = "soft"; + }; + }; + + # https://developer.android.com/ndk/guides/abis#v7a + armv7a-android = { + name = "armeabi-v7a"; + gcc = { + arch = "armv7-a"; + float = "hard"; + float-abi = "softfp"; + fpu = "vfpv3-d16"; + }; + }; + armv7l-hf-multiplatform = { name = "armv7l-hf-multiplatform"; kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc. @@ -498,7 +441,6 @@ rec { # and the above page suggests NEON is only an improvement with hand-written assembly. arch = "armv7-a"; fpu = "vfpv3-d16"; - float = "hard"; # For Raspberry Pi the 2 the best would be: # cpu = "cortex-a7"; @@ -541,6 +483,102 @@ rec { }; }; + ## + ## MIPS + ## + + ben_nanonote = { + name = "ben_nanonote"; + kernelMajor = "2.6"; + kernelArch = "mips"; + gcc = { + arch = "mips32"; + float = "soft"; + }; + }; + + fuloong2f_n32 = { + name = "fuloong2f_n32"; + kernelMajor = "2.6"; + kernelBaseConfig = "lemote2f_defconfig"; + kernelArch = "mips"; + kernelAutoModules = false; + kernelExtraConfig = '' + MIGRATION n + COMPACTION n + + # nixos mounts some cgroup + CGROUPS y + + BLK_DEV_RAM y + BLK_DEV_INITRD y + BLK_DEV_CRYPTOLOOP m + BLK_DEV_DM m + DM_CRYPT m + MD y + REISERFS_FS m + EXT4_FS m + USB_STORAGE_CYPRESS_ATACB m + + IP_PNP y + IP_PNP_DHCP y + IP_PNP_BOOTP y + NFS_FS y + ROOT_NFS y + TUN m + NFS_V4 y + NFS_V4_1 y + NFS_FSCACHE y + NFSD m + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + + # Fail to build + DRM n + SCSI_ADVANSYS n + USB_ISP1362_HCD n + SND_SOC n + SND_ALI5451 n + FB_SAVAGE n + SCSI_NSP32 n + ATA_SFF n + SUNGEM n + IRDA n + ATM_HE n + SCSI_ACARD n + BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m + + # Needed for udev >= 150 + SYSFS_DEPRECATED_V2 n + + VGA_CONSOLE n + VT_HW_CONSOLE_BINDING y + SERIAL_8250_CONSOLE y + FRAMEBUFFER_CONSOLE y + EXT2_FS y + EXT3_FS y + REISERFS_FS y + MAGIC_SYSRQ y + + # The kernel doesn't boot at all, with FTRACE + FTRACE n + ''; + kernelTarget = "vmlinux"; + gcc = { + arch = "loongson2f"; + float = "hard"; + abi = "n32"; + }; + }; + + ## + ## Other + ## + riscv-multiplatform = bits: { name = "riscv-multiplatform"; kernelArch = "riscv"; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 96a91c0fffbc986996be6f657b8ccab4f66db4b3..b83e1eb7d82d01bc228d9af375be0e49204ef506 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -136,7 +136,18 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix + +# Check coerced value with unsound coercion +checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix +checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix + +# Check loaOf with long list. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix + +# Check loaOf with many merges of lists. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix cat <"]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); @@ -361,7 +372,13 @@ rec { # This is mandatory as some option declaration might use the # "name" attribute given as argument of the submodule and use it # as the default of option declarations. - args.name = "<name>"; + # + # Using lookalike unicode single angle quotation marks because + # of the docbook transformation the options receive. In all uses + # > and < wouldn't be encoded correctly so the encoded values + # would be used, and use of `<` and `>` would break the XML document. + # It shouldn't cause an issue since this is cosmetic for the manual. + args.name = "‹name›"; }).options; getSubModules = opts'; substSubModules = m: submodule m; @@ -419,16 +436,13 @@ rec { assert coercedType.getSubModules == null; mkOptionType rec { name = "coercedTo"; - description = "${finalType.description} or ${coercedType.description}"; - check = x: finalType.check x || coercedType.check x; + description = "${finalType.description} or ${coercedType.description} convertible to it"; + check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x)); merge = loc: defs: let coerceVal = val: if finalType.check val then val - else let - coerced = coerceFunc val; - in assert finalType.check coerced; coerced; - + else coerceFunc val; in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); getSubOptions = finalType.getSubOptions; getSubModules = finalType.getSubModules; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4b584e6a1151eb1e4bdb6ab9e701cc1f17ce379f..0c3175823b0723f69c775cb1ddb07d633fc20431 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -43,6 +43,11 @@ github = "ChengCat"; name = "Yucheng Zhang"; }; + CrazedProgrammer = { + email = "crazedprogrammer@gmail.com"; + github = "CrazedProgrammer"; + name = "CrazedProgrammer"; + }; CrystalGamma = { email = "nixos@crystalgamma.de"; github = "CrystalGamma"; @@ -676,6 +681,11 @@ github = "bramd"; name = "Bram Duvigneau"; }; + brian-dawn = { + email = "brian.t.dawn@gmail.com"; + github = "brian-dawn"; + name = "Brian Dawn"; + }; bstrik = { email = "dutchman55@gmx.com"; github = "bstrik"; @@ -979,9 +989,9 @@ name = "Davor Babic"; }; dbohdan = { - email = "danyil.bohdan@gmail.com"; + email = "dbohdan@dbohdan.com"; github = "dbohdan"; - name = "Danyil Bohdan"; + name = "D. Bohdan"; }; dbrock = { email = "daniel@brockman.se"; @@ -998,6 +1008,11 @@ github = "demin-dmitriy"; name = "Dmitriy Demin"; }; + demyanrogozhin = { + email = "demyan.rogozhin@gmail.com"; + github = "demyanrogozhin"; + name = "Demyan Rogozhin"; + }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; @@ -1221,6 +1236,11 @@ github = "ElvishJerricco"; name = "Will Fancher"; }; + emmanuelrosa = { + email = "emmanuel_rosa@aol.com"; + github = "emmanuelrosa"; + name = "Emmanuel Rosa"; + }; endgame = { email = "jack@jackkelly.name"; github = "endgame"; @@ -1468,6 +1488,11 @@ github = "georgewhewell"; name = "George Whewell"; }; + gerschtli = { + email = "tobias.happ@gmx.de"; + github = "Gerschtli"; + name = "Tobias Happ"; + }; gilligan = { email = "tobias.pflug@gmail.com"; github = "gilligan"; @@ -1740,6 +1765,11 @@ github = "jdagilliland"; name = "Jason Gilliland"; }; + jD91mZM2 = { + email = "me@krake.one"; + github = "jD91mZM2"; + name = "jD91mZM2"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; @@ -1815,6 +1845,11 @@ github = "joamaki"; name = "Jussi Maki"; }; + joelburget = { + email = "joelburget@gmail.com"; + github = "joelburget"; + name = "Joel Burget"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; @@ -1967,6 +2002,11 @@ github = "kini"; name = "Keshav Kini"; }; + kirelagin = { + email = "kirelagin@gmail.com"; + github = "kirelagin"; + name = "Kirill Elagin"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -2011,6 +2051,11 @@ github = "kristoff3r"; name = "Kristoffer Søholm"; }; + ktf = { + email = "giulio.eulisse@cern.ch"; + github = "ktf"; + name = "Giuluo Eulisse"; + }; ktosiek = { email = "tomasz.kontusz@gmail.com"; github = "ktosiek"; @@ -2358,6 +2403,11 @@ github = "meditans"; name = "Carlo Nucera"; }; + megheaiulian = { + email = "iulian.meghea@gmail.com"; + github = "megheaiulian"; + name = "Meghea Iulian"; + }; mehandes = { email = "niewskici@gmail.com"; github = "mehandes"; @@ -2471,6 +2521,16 @@ github = "mmahut"; name = "Marek Mahut"; }; + mmlb = { + email = "me.mmlb@mmlb.me"; + github = "mmlb"; + name = "Manuel Mendez"; + }; + mnacamura = { + email = "m.nacamura@gmail.com"; + github = "mnacamura"; + name = "Mitsuhiro Nakamura"; + }; moaxcp = { email = "moaxcp@gmail.com"; github = "moaxcp"; @@ -3006,6 +3066,11 @@ email = "philipp@xndr.de"; name = "Philipp Steinpaß"; }; + psyanticy = { + email = "iuns@outlook.fr"; + github = "Assassinkin"; + name = "Psyanticy"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; @@ -3139,6 +3204,11 @@ github = "rittelle"; name = "Lennart Rittel"; }; + rkoe = { + email = "rk@simple-is-better.org"; + github = "rkoe"; + name = "Roland Koebler"; + }; rlupton20 = { email = "richard.lupton@gmail.com"; github = "rlupton20"; @@ -3219,6 +3289,11 @@ github = "rushmorem"; name = "Rushmore Mushambi"; }; + ruuda = { + email = "dev+nix@veniogames.com"; + github = "ruuda"; + name = "Ruud van Asseldonk"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; @@ -3731,6 +3806,11 @@ github = "titanous"; name = "Jonathan Rudenberg"; }; + tmplt = { + email = "tmplt@dragons.rocks"; + github = "tmplt"; + name = "Viktor"; + }; tnias = { email = "phil@grmr.de"; github = "tnias"; @@ -3825,6 +3905,11 @@ github = "typetetris"; name = "Eric Wolf"; }; + udono = { + email = "udono@virtual-things.biz"; + github = "udono"; + name = "Udo Spallek"; + }; unode = { email = "alves.rjc@gmail.com"; github = "unode"; diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 0990e9d932bae7db533bfb2cfaf090a23b531e68..6502aaec83e532fe0a4f4e1ec29411f3551eff55 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -50,9 +50,9 @@ nixpkgs.config.packageOverrides = pkgs: = [ "fuse" "kvm-intel" "coretemp" ]; If the module is required early during the boot (e.g. to mount the root file - system), you can use : + system), you can use : - = [ "cifs" ]; + = [ "cifs" ]; This causes the specified modules and their dependencies to be added to the initial ramdisk. diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 7969d812473824cc8833d14986e0bf9f4f0615cc..5cb747e6d9f1ea7ac8382bc039f38b0b5f0986c0 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -21,6 +21,15 @@ + + types.attrs + + + + A free-form attribute set. + + + types.bool diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index d4e5ff3f4312e713d3ff445e51452cab743ea908..863110a1c7ca8a531b941ebbceb197bdca402fa4 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -70,7 +70,7 @@ - Bump the system.defaultChannel attribute in + Bump the system.nixos.defaultChannel attribute in nixos/modules/misc/version.nix diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 8b0c350b064dd712f8e68c14c8098ff88e629f00..c55aa90267fbbf2523699805d264ec09bfd60464 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -47,7 +47,7 @@ Short version: -$ bash <(curl https://nixos.org/nix/install) +$ curl https://nixos.org/nix/install | sh $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell More details in the diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index e500c9d634224224cbe9a376efe8a03296591ee8..734bc076b8525429636d6fe83dfd8aefb93a0de7 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -433,9 +433,9 @@ system.autoUpgrade.enable = true; default. If you have existing systems with such host keys and want to continue to use them, please set -system.stateVersion = "14.12"; +system.nixos.stateVersion = "14.12"; - The new option ensures that certain + The new option ensures that certain configuration changes that could break existing systems (such as the sshd host key setting) will maintain compatibility with the specified NixOS release. NixOps sets the state version of existing diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index ec7b2f107e8e25bcad6b37f09958c16de9946acc..0ae630945db2be157adf3904b0d3df785ee24e1d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -53,7 +53,10 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - + When enabled the iproute2 will copy the files + expected by ip route (e.g., rt_tables) in + /run/iproute2. This allows to write aliases for + routing tables for instance. @@ -101,6 +104,17 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' that can be mapped onto the YAML configuration defined in the docker/distribution docs. + + + gnucash has changed from version 2.4 to 3.x. + If you've been using gnucash (version 2.4) instead of + gnucash26 (version 2.6) you must open your Gnucash + data file(s) with gnucash26 and then save them to + upgrade the file format. Then you may use your data file(s) with + Gnucash 3.x. See the upgrade documentation. + Gnucash 2.4 is still available under the attribute gnucash24. + + @@ -169,6 +183,64 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' for further reference. + + + The module for has two new options now: + + + + + + + Puts the generated Diffie-Hellman parameters into the Nix store instead + of managing them in a stateful manner in + /var/lib/dhparams. + + + + + + The default bit size to use for the generated Diffie-Hellman parameters. + + + + + + The path to the actual generated parameter files should now be queried + using + config.security.dhparams.params.name.path + because it might be either in the Nix store or in a directory configured + by . + + + + For developers: + + Module implementers should not set a specific bit size in order to let + users configure it by themselves if they want to have a different bit + size than the default (2048). + + + An example usage of this would be: + +{ config, ... }: + +{ + security.dhparams.params.myservice = {}; + environment.etc."myservice.conf".text = '' + dhparams = ${config.security.dhparams.params.myservice.path} + ''; +} + + + + + + + networking.networkmanager.useDnsmasq has been deprecated. Use + networking.networkmanager.dns instead. + + diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 986d80ff1b999674aecb52e91869acd23c525848..4095d9c6d00d438f056a10363218a1ffe65be125 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -14,7 +14,7 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; + nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl]; buildCommand = '' @@ -83,5 +83,12 @@ pkgs.stdenv.mkDerivation { echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" return 1 fi + + # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. + if ! fsck.ext4 -n -f $out; then + echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" + cat errorlog + return 1 + fi ''; } diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 972c04453aefcde4b9f0847379c9154726dc1111..eeae27ede0f89f04f43dc5d12a284cc87fd7559e 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -8,6 +8,11 @@ in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; + # Required to provide good EBS experience, + # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes + # TODO change value to 4294967295 when kernel is updated to 4.15 or later + config.boot.kernelParams = [ "nvme_core.io_timeout=255" ]; + options.amazonImage = { name = mkOption { type = types.str; diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix new file mode 100644 index 0000000000000000000000000000000000000000..881ad671a627596c8b903c8bc1fb493ce96acc9d --- /dev/null +++ b/nixos/modules/config/iproute2.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.iproute2; + confDir = "/run/iproute2"; +in +{ + options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files"; + + config = mkMerge [ + ({ nixpkgs.config.iproute2.confDir = confDir; }) + + (mkIf cfg.enable { + system.activationScripts.iproute2 = '' + cp -R ${pkgs.iproute}/etc/iproute2 ${confDir} + chmod -R 664 ${confDir} + chmod +x ${confDir} + ''; + }) + ]; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 756c8751d00e5ddc829e4ab6b24b60a2af72221d..1ed56386e6e77241660064f94893ad6b66a6d06d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -31,4 +31,6 @@ with lib; # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; + + system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6bb556a0123c14defb3c3170d5f19e4576e98e3b..5ad28ea9499ef0b6d53c9b5920d3e0e46b34b047 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/2gk7rk2sx2dkmsjr59gignrfdmya8f6s-nix-2.0.1"; - i686-linux = "/nix/store/5160glkphiv13qggnivyidg8r0491pbl-nix-2.0.1"; - aarch64-linux = "/nix/store/jk29zz3ns9vdkkclcyzzkpzp8dhv1x3i-nix-2.0.1"; - x86_64-darwin = "/nix/store/4a9czmrpd4hf3r80zcmga2c2lm3hbbvv-nix-2.0.1"; + x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2"; + i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2"; + aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2"; + x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2"; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 74b61a64667e0fe4c48590c33a88755a7720ade6..a198c2d49b531f586a7b4281fb774c6d3eb3cb2d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -628,7 +628,7 @@ $bootLoaderConfig # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you # should. - system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment? + system.nixos.stateVersion = "${\(qw(@release@))}"; # Did you read the comment? } EOF diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index beac9e29d59cf9978670db567ebb9440d1323736..42b00b2025d835dab8dcc6c50a5a4c873633da86 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -76,7 +76,7 @@ in ]; system.build = { - inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild nixos-enter; + inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter; }; }; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 13a0d7f4f6ee79ae500634ccb9a8e43f9f8b4ca3..c40e3035420617f88ed89617bf158d18ccbe7384 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -21,4 +21,5 @@ with lib; services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; powerManagement.enable = false; + system.nixos.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 2e426c017080f3d949fbcd8fa66a4a11d851d57f..b482a5a675230405cc6d7f2c35928330dbca80e2 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -75,20 +75,20 @@ let cfg = config.documentation; in (mkIf cfg.man.enable { environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ]; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; }) (mkIf cfg.info.enable { environment.systemPackages = [ pkgs.texinfoInteractive ]; environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ]; + environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo"; }) (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; - environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ]; + environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; }) ]); diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0ed820a32acc02d6e8f8afaaa3d3bd9e6c19667e..cc7d868498241f48fe5a834df207af1b55a1e7b5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -190,7 +190,7 @@ cadvisor = 167; nylon = 168; apache-kafka = 169; - panamax = 170; + #panamax = 170; # unused exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -306,6 +306,7 @@ ceph = 288; duplicati = 289; monetdb = 290; + restic = 291; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -473,9 +474,9 @@ #chronos = 164; # unused gitlab = 165; nylon = 168; - panamax = 170; + #panamax = 170; # unused exim = 172; - fleet = 173; + #fleet = 173; # unused input = 174; sddm = 175; tss = 176; @@ -580,6 +581,7 @@ ceph = 288; duplicati = 289; monetdb = 290; + restic = 291; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 74c86443ab90a314669398000177b97d3df0cb6c..33d8a786169394ffa81f0c098711cbbf4be2a448 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ options, config, lib, pkgs, ... }: with lib; @@ -12,29 +12,29 @@ in { - options.system = { + options.system.nixos = { - nixos.version = mkOption { + version = mkOption { internal = true; type = types.str; description = "The full NixOS version (e.g. 16.03.1160.f2d4ee1)."; }; - nixos.release = mkOption { + release = mkOption { readOnly = true; type = types.str; default = trivial.release; description = "The NixOS release (e.g. 16.03)."; }; - nixos.versionSuffix = mkOption { + versionSuffix = mkOption { internal = true; type = types.str; default = trivial.versionSuffix; description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; }; - nixos.revision = mkOption { + revision = mkOption { internal = true; type = types.str; default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo @@ -43,7 +43,7 @@ in description = "The Git revision from which this NixOS configuration was built."; }; - nixos.codeName = mkOption { + codeName = mkOption { readOnly = true; type = types.str; description = "The NixOS release code name (e.g. Emu)."; @@ -76,6 +76,9 @@ in config = { + warnings = lib.optional (options.system.nixos.stateVersion.highestPrio > 1000) + "You don't have `system.nixos.stateVersion` explicitly set. Expect things to break."; + system.nixos = { # These defaults are set here rather than up there so that # changing them would not rebuild the manual diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 505c5497d36d9b0a56c0423d662baf77482de90e..d5cfd87520c5267ac6c676ce355d0917b0561c8e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -9,6 +9,7 @@ ./config/fonts/ghostscript.nix ./config/gnu.nix ./config/i18n.nix + ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix ./config/networking.nix @@ -101,6 +102,7 @@ ./programs/qt5ct.nix ./programs/rootston.nix ./programs/screen.nix + ./programs/sedutil.nix ./programs/slock.nix ./programs/shadow.nix ./programs/shell.nix @@ -120,6 +122,7 @@ ./programs/wireshark.nix ./programs/xfs_quota.nix ./programs/xonsh.nix + ./programs/xss-lock.nix ./programs/yabar.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh.nix @@ -167,14 +170,13 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/restic.nix + ./services/backup/restic-rest-server.nix ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix - ./services/cluster/fleet.nix ./services/cluster/kubernetes/default.nix ./services/cluster/kubernetes/dns.nix ./services/cluster/kubernetes/dashboard.nix - ./services/cluster/panamax.nix ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix @@ -215,6 +217,7 @@ ./services/desktops/accountsservice.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix + ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix ./services/desktops/pipewire.nix ./services/desktops/gnome3/at-spi2-core.nix @@ -381,6 +384,7 @@ ./services/misc/sundtek.nix ./services/misc/svnserve.nix ./services/misc/synergy.nix + ./services/misc/sysprof.nix ./services/misc/taskserver ./services/misc/tzupdate.nix ./services/misc/uhub.nix @@ -514,6 +518,7 @@ ./services/networking/murmur.nix ./services/networking/namecoind.nix ./services/networking/nat.nix + ./services/networking/ndppd.nix ./services/networking/networkmanager.nix ./services/networking/nftables.nix ./services/networking/ngircd.nix @@ -566,6 +571,7 @@ ./services/networking/strongswan.nix ./services/networking/strongswan-swanctl/module.nix ./services/networking/stunnel.nix + ./services/networking/stubby.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix ./services/networking/syncthing.nix @@ -649,6 +655,7 @@ ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix ./services/web-apps/quassel-webserver.nix + ./services/web-apps/youtrack.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix ./services/web-servers/fcgiwrap.nix @@ -780,6 +787,7 @@ ./virtualisation/hyperv-guest.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix + ./virtualisation/qemu-guest-agent.nix ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 3bf06a951193fc36e137cab17ef1b6cbe6e7ddf2..52481d90eab9e06a3d55a6ce13d107df0cac0f6b 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -17,6 +17,7 @@ pkgs.ddrescue pkgs.ccrypt pkgs.cryptsetup # needed for dm-crypt volumes + pkgs.mkpasswd # for generating password files # Some networking tools. pkgs.fuse diff --git a/nixos/modules/programs/sedutil.nix b/nixos/modules/programs/sedutil.nix new file mode 100644 index 0000000000000000000000000000000000000000..7efc80f4abba2ec8243b014de24eb4a44e5e150d --- /dev/null +++ b/nixos/modules/programs/sedutil.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.sedutil; + +in { + options.programs.sedutil.enable = mkEnableOption "sedutil"; + + config = mkIf cfg.enable { + boot.kernelParams = [ + "libata.allow_tpm=1" + ]; + + environment.systemPackages = with pkgs; [ sedutil ]; + }; +} diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index d8845fd8f44639a075cbc219b32836f28a565458..3504a8a924b03e48523656e1ef13f4aaa09b33da 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -40,7 +40,7 @@ in # Subscribe the root user to the NixOS channel by default. if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then - echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels + echo "${config.system.nixos.defaultChannel} nixos" > $HOME/.nix-channels fi # Create the per-user garbage collector roots directory. diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix new file mode 100644 index 0000000000000000000000000000000000000000..49d522c604f5fb1cfafa12a7efc212f005909680 --- /dev/null +++ b/nixos/modules/programs/xss-lock.nix @@ -0,0 +1,26 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.xss-lock; +in +{ + options.programs.xss-lock = { + enable = mkEnableOption "xss-lock"; + lockerCommand = mkOption { + example = "xlock"; + type = types.string; + description = "Locker to be used with xsslock"; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.xss-lock = { + description = "XSS Lock Daemon"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig.ExecStart = "${pkgs.xss-lock}/bin/xss-lock ${cfg.lockerCommand}"; + }; + }; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a1ead80cc21577b827c9e2d0adc0b908def0b3a5..8820a6da8c0b60ad02c321ee89fa7e27ad1f5803 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,6 +17,7 @@ with lib; (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] @@ -203,6 +204,8 @@ with lib; (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) + (mkRenamedOptionModule [ "system" "stateVersion" ] [ "system" "nixos" "stateVersion" ]) + (mkRenamedOptionModule [ "system" "defaultChannel" ] [ "system" "nixos" "defaultChannel" ]) # Users (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e430c2ddb903d67adb3a2020877dfaa1a78f0aeb..9e5d636241e973ca700d6a8e269ad3b25e37a5ef 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -257,7 +257,7 @@ in if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then ${if data.activationDelay != null then '' - + ${data.preDelay} if [ -d '${lpath}' ]; then @@ -266,6 +266,10 @@ in systemctl --wait start acme-setlive-${cert}.service fi '' else data.postRun} + + # noop ensuring that the "if" block is non-empty even if + # activationDelay == null and postRun == "" + true fi ''; @@ -294,7 +298,7 @@ in chown '${data.user}:${data.group}' '${cpath}' fi ''; - script = + script = '' workdir="$(mktemp -d)" diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 55c75713101d323dca33a1eb5754430d042a64e7..e2b84c3e3b38018b95aa1ea7e8e1911e31f56226 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,107 +1,173 @@ { config, lib, pkgs, ... }: -with lib; let + inherit (lib) mkOption types; cfg = config.security.dhparams; -in -{ + + bitType = types.addCheck types.int (b: b >= 16) // { + name = "bits"; + description = "integer of at least 16 bits"; + }; + + paramsSubmodule = { name, config, ... }: { + options.bits = mkOption { + type = bitType; + default = cfg.defaultBitSize; + description = '' + The bit size for the prime that is used during a Diffie-Hellman + key exchange. + ''; + }; + + options.path = mkOption { + type = types.path; + readOnly = true; + description = '' + The resulting path of the generated Diffie-Hellman parameters + file for other services to reference. This could be either a + store path or a file inside the directory specified by + . + ''; + }; + + config.path = let + generated = pkgs.runCommand "dhparams-${name}.pem" { + nativeBuildInputs = [ pkgs.openssl ]; + } "openssl dhparam -out \"$out\" ${toString config.bits}"; + in if cfg.stateful then "${cfg.path}/${name}.pem" else generated; + }; + +in { options = { security.dhparams = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate new DH params and clean up old DH params. + ''; + }; + params = mkOption { - description = - '' - Diffie-Hellman parameters to generate. - - The value is the size (in bits) of the DH params to generate. The - generated DH params path can be found in - security.dhparams.path/name.pem. - - Note: The name of the DH params is taken as being the name of the - service it serves: the params will be generated before the said - service is started. - - Warning: If you are removing all dhparams from this list, you have - to leave security.dhparams.enable for at least one activation in - order to have them be cleaned up. This also means if you rollback to - a version without any dhparams the existing ones won't be cleaned - up. - ''; - type = with types; attrsOf int; + type = with types; let + coerce = bits: { inherit bits; }; + in attrsOf (coercedTo int coerce (submodule paramsSubmodule)); default = {}; - example = { nginx = 3072; }; + example = lib.literalExample "{ nginx.bits = 3072; }"; + description = '' + Diffie-Hellman parameters to generate. + + The value is the size (in bits) of the DH params to generate. The + generated DH params path can be found in + config.security.dhparams.params.name.path. + + The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started. + + If you are removing all dhparams from this list, you + have to leave for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. Of course this only applies if + is + true. + + For module implementers:It's recommended + to not set a specific bit size here, so that users can easily + override this by setting + . + ''; + }; + + stateful = mkOption { + type = types.bool; + default = true; + description = '' + Whether generation of Diffie-Hellman parameters should be stateful or + not. If this is enabled, PEM-encoded files for Diffie-Hellman + parameters are placed in the directory specified by + . Otherwise the files are + created within the Nix store. + + If this is false the resulting store + path will be non-deterministic and will be rebuilt every time the + openssl package changes. + ''; + }; + + defaultBitSize = mkOption { + type = bitType; + default = 2048; + description = '' + This allows to override the default bit size for all of the + Diffie-Hellman parameters set in + . + ''; }; path = mkOption { - description = - '' - Path to the directory in which Diffie-Hellman parameters will be - stored. - ''; type = types.str; default = "/var/lib/dhparams"; - }; - - enable = mkOption { - description = - '' - Whether to generate new DH params and clean up old DH params. - ''; - default = false; - type = types.bool; + description = '' + Path to the directory in which Diffie-Hellman parameters will be + stored. This only is relevant if + is + true. + ''; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { - description = "Cleanup old Diffie-Hellman parameters"; - wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set + description = "Clean Up Old Diffie-Hellman Parameters"; + + # Clean up even when no DH params is set + wantedBy = [ "multi-user.target" ]; + + serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; - script = - # Create directory - '' - if [ ! -d ${cfg.path} ]; then - mkdir -p ${cfg.path} - fi - '' + + + script = '' + if [ ! -d ${cfg.path} ]; then + mkdir -p ${cfg.path} + fi + # Remove old dhparams - '' - for file in ${cfg.path}/*; do - if [ ! -f "$file" ]; then - continue - fi - '' + concatStrings (mapAttrsToList (name: value: - '' - if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then + for file in ${cfg.path}/*; do + if [ ! -f "$file" ]; then + continue + fi + ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: '' + if [ "$file" = ${lib.escapeShellArg path} ] && \ + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \ + | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then continue fi - '' - ) cfg.params) + - '' - rm $file - done - - # TODO: Ideally this would be removing the *former* cfg.path, though this - # does not seem really important as changes to it are quite unlikely - rmdir --ignore-fail-on-non-empty ${cfg.path} - ''; + '') cfg.params)} + rm $file + done + + # TODO: Ideally this would be removing the *former* cfg.path, though + # this does not seem really important as changes to it are quite + # unlikely + rmdir --ignore-fail-on-non-empty ${cfg.path} + ''; }; - } // - mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { - description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; - after = [ "dhparams-init.service" ]; - before = [ "${name}.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - script = - '' - mkdir -p ${cfg.path} - if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} - fi - ''; - }) cfg.params; + } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" { + description = "Generate Diffie-Hellman Parameters for ${name}"; + after = [ "dhparams-init.service" ]; + before = [ "${name}.service" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!${path}"; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${lib.escapeShellArg cfg.path} + ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \ + ${toString bits} + ''; + }) cfg.params; }; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 48998285d89d695c07157893d07b1b06f0019c65..bef10b4fe614c92b5ce1693347c3896e55eb6c99 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -449,6 +449,10 @@ in item, and value attribute. The syntax and semantics of these attributes must be that described in the limits.conf(5) man page. + + Note that these limits do not apply to systemd services, + whose limits can be changed via + instead. ''; }; diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix new file mode 100644 index 0000000000000000000000000000000000000000..d4b47a09941016774cf2999ef1f4fc79bd32cb90 --- /dev/null +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.restic.server; +in +{ + meta.maintainers = [ maintainers.bachp ]; + + options.services.restic.server = { + enable = mkEnableOption "Restic REST Server"; + + listenAddress = mkOption { + default = ":8000"; + example = "127.0.0.1:8080"; + type = types.str; + description = "Listen on a specific IP address and port."; + }; + + dataDir = mkOption { + default = "/var/lib/restic"; + type = types.path; + description = "The directory for storing the restic repository."; + }; + + appendOnly = mkOption { + default = false; + type = types.bool; + description = '' + Enable append only mode. + This mode allows creation of new backups but prevents deletion and modification of existing backups. + This can be useful when backing up systems that have a potential of being hacked. + ''; + }; + + privateRepos = mkOption { + default = false; + type = types.bool; + description = '' + Enable private repos. + Grants access only when a subdirectory with the same name as the user is specified in the repository URL. + ''; + }; + + prometheus = mkOption { + default = false; + type = types.bool; + description = "Enable Prometheus metrics at /metrics."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options to pass to Restic REST server. + ''; + }; + + package = mkOption { + default = pkgs.restic-rest-server; + defaultText = "pkgs.restic-rest-server"; + type = types.package; + description = "Restic REST server package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.restic-rest-server = { + description = "Restic REST Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/rest-server \ + --listen ${cfg.listenAddress} \ + --path ${cfg.dataDir} \ + ${optionalString cfg.appendOnly "--append-only"} \ + ${optionalString cfg.privateRepos "--private-repos"} \ + ${optionalString cfg.prometheus "--prometheus"} \ + ${escapeShellArgs cfg.extraFlags} \ + ''; + Type = "simple"; + User = "restic"; + Group = "restic"; + + # Security hardening + ReadWritePaths = [ cfg.dataDir ]; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + PrivateDevices = true; + }; + }; + + users.extraUsers.restic = { + group = "restic"; + home = cfg.dataDir; + createHome = true; + uid = config.ids.uids.restic; + }; + + users.extraGroups.restic.gid = config.ids.uids.restic; + }; +} diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix deleted file mode 100644 index ec03be3959483cf3c033a6583ec913143fad2e95..0000000000000000000000000000000000000000 --- a/nixos/modules/services/cluster/fleet.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.fleet; - -in { - - ##### Interface - options.services.fleet = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fleet service. - ''; - }; - - listen = mkOption { - type = types.listOf types.str; - default = [ "/var/run/fleet.sock" ]; - example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ]; - description = '' - Fleet listening addresses. - ''; - }; - - etcdServers = mkOption { - type = types.listOf types.str; - default = [ "http://127.0.0.1:2379" ]; - description = '' - Fleet list of etcd endpoints to use. - ''; - }; - - publicIp = mkOption { - type = types.nullOr types.str; - default = ""; - description = '' - Fleet IP address that should be published with the local Machine's - state and any socket information. If not set, fleetd will attempt - to detect the IP it should publish based on the machine's IP - routing information. - ''; - }; - - etcdCafile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS ca file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdKeyfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS key file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdCertfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS cert file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - metadata = mkOption { - type = types.attrsOf types.str; - default = {}; - apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs); - example = literalExample '' - { - region = "us-west"; - az = "us-west-1"; - } - ''; - description = '' - Key/value pairs that are published with the local to the fleet registry. - This data can be used directly by a client of fleet to make scheduling decisions. - ''; - }; - - extraConfig = mkOption { - type = types.attrsOf types.str; - apply = mapAttrs' (n: v: nameValuePair ("FLEET_" + n) v); - default = {}; - example = literalExample '' - { - VERBOSITY = 1; - ETCD_REQUEST_TIMEOUT = "2.0"; - AGENT_TTL = "40s"; - } - ''; - description = '' - Fleet extra config. See - - for configuration options. - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.fleet = { - description = "Fleet Init System Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ]; - requires = [ "fleet.socket" ]; - environment = { - FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers; - FLEET_PUBLIC_IP = cfg.publicIp; - FLEET_ETCD_CAFILE = cfg.etcdCafile; - FLEET_ETCD_KEYFILE = cfg.etcdKeyfile; - FLEET_ETCD_CERTFILE = cfg.etcdCertfile; - FLEET_METADATA = cfg.metadata; - } // cfg.extraConfig; - serviceConfig = { - ExecStart = "${pkgs.fleet}/bin/fleetd"; - Group = "fleet"; - }; - }; - - systemd.sockets.fleet = { - description = "Fleet Socket for the API"; - wantedBy = [ "sockets.target" ]; - listenStreams = cfg.listen; - socketConfig = { - ListenStream = "/var/run/fleet.sock"; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "fleet"; - }; - }; - - services.etcd.enable = mkDefault true; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ pkgs.fleet ]; - users.extraGroups.fleet.gid = config.ids.gids.fleet; - }; -} diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix deleted file mode 100644 index 4475e8d8c24b4501e9e45856a76499e7097e8680..0000000000000000000000000000000000000000 --- a/nixos/modules/services/cluster/panamax.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.panamax; - - panamax_api = pkgs.panamax_api.override { dataDir = cfg.dataDir + "/api"; }; - panamax_ui = pkgs.panamax_ui.override { dataDir = cfg.dataDir + "/ui"; }; - -in { - - ##### Interface - options.services.panamax = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Panamax service. - ''; - }; - - UIPort = mkOption { - type = types.int; - default = 8888; - description = '' - Panamax UI listening port. - ''; - }; - - APIPort = mkOption { - type = types.int; - default = 3000; - description = '' - Panamax UI listening port. - ''; - }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/panamax"; - description = '' - Data dir for Panamax. - ''; - }; - - fleetctlEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:2379"; - description = '' - Panamax fleetctl endpoint. - ''; - }; - - journalEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:19531"; - description = '' - Panamax journal endpoint. - ''; - }; - - secretKey = mkOption { - type = types.str; - default = "SomethingVeryLong."; - description = '' - Panamax secret key (do change this). - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.panamax-api = { - description = "Panamax API"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.service" "etcd.service" "docker.service" ]; - - path = [ panamax_api ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - FLEETCTL_ENDPOINT = cfg.fleetctlEndpoint; - PANAMAX_DATABASE_PATH = "${cfg.dataDir}/api/db/mnt/db.sqlite3"; - }; - - preStart = '' - rm -rf ${cfg.dataDir}/state/tmp - mkdir -p ${cfg.dataDir}/api/{db/mnt,state/log,state/tmp} - ln -sf ${panamax_api}/share/panamax-api/_db/{schema.rb,seeds.rb,migrate} ${cfg.dataDir}/api/db/ - - if [ ! -f ${cfg.dataDir}/.created ]; then - bundle exec rake db:setup - bundle exec rake db:seed - bundle exec rake panamax:templates:load || true - touch ${cfg.dataDir}/.created - else - bundle exec rake db:migrate - fi - ''; - - serviceConfig = { - ExecStart = "${panamax_api}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.APIPort}"; - User = "panamax"; - Group = "panamax"; - }; - }; - - systemd.services.panamax-ui = { - description = "Panamax UI"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "panamax_api.service" ]; - - path = [ panamax_ui ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - PMX_API_PORT_3000_TCP_ADDR = "localhost"; - PMX_API_PORT_3000_TCP_PORT = toString cfg.APIPort; - SECRET_KEY_BASE = cfg.secretKey; - }; - - preStart = '' - mkdir -p ${cfg.dataDir}/ui/state/{log,tmp} - chown -R panamax:panamax ${cfg.dataDir} - ''; - - serviceConfig = { - ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}"; - User = "panamax"; - Group = "panamax"; - PermissionsStartOnly = true; - }; - }; - - users.extraUsers.panamax = - { uid = config.ids.uids.panamax; - description = "Panamax user"; - createHome = true; - home = cfg.dataDir; - extraGroups = [ "docker" ]; - }; - - services.journald.enableHttpGateway = mkDefault true; - services.fleet.enable = mkDefault true; - services.cadvisor.enable = mkDefault true; - services.cadvisor.port = mkDefault 3002; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ panamax_api panamax_ui ]; - users.extraGroups.panamax.gid = config.ids.gids.panamax; - }; -} diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 21a131b90a8115f6277cf8ce3f63867b519189ae..66c9330c35505c48dc083f739d72b0c86cac092c 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -218,7 +218,7 @@ in config = mkIf config.services.mysql.enable { services.mysql.dataDir = - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" + mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"); users.extraUsers.mysql = { diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index f022e0863dfd375982a79070e963e910e140eab4..4ad4728ccda6e8a7837740e92b131ff8bb92307e 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -147,7 +147,7 @@ in }; superUser = mkOption { type = types.str; - default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root"; + default= if versionAtLeast config.system.nixos.stateVersion "17.09" then "postgres" else "root"; internal = true; description = '' NixOS traditionally used 'root' as superuser, most other distros use 'postgres'. @@ -166,14 +166,14 @@ in services.postgresql.package = # Note: when changing the default, make it conditional on - # ‘system.stateVersion’ to maintain compatibility with existing + # ‘system.nixos.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96 - else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 + mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then pkgs.postgresql96 + else if versionAtLeast config.system.nixos.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94); services.postgresql.dataDir = - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" + mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" else "/var/db/postgresql"); services.postgresql.authentication = mkAfter diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix new file mode 100644 index 0000000000000000000000000000000000000000..024dc65629a8ddf22129501a6fc50bb8524cf79a --- /dev/null +++ b/nixos/modules/services/desktops/flatpak.nix @@ -0,0 +1,52 @@ +# flatpak service. +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.flatpak; +in { + meta = { + doc = ./flatpak.xml; + maintainers = pkgs.flatpak.meta.maintainers; + }; + + ###### interface + options = { + services.flatpak = { + enable = mkEnableOption "flatpak"; + + extraPortals = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of additional portals to add to path. Portals allow interaction + with system, like choosing files or taking screenshots. At minimum, + a desktop portal implementation should be listed. GNOME already + adds xdg-desktop-portal-gtk; for KDE, there + is xdg-desktop-portal-kde. Other desktop + environments will probably want to do the same. + ''; + }; + }; + }; + + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.flatpak ]; + + services.dbus.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; + + systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; + + environment.variables = { + PATH = [ + "$HOME/.local/share/flatpak/exports/bin" + "/var/lib/flatpak/exports/bin" + ]; + + XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals; + }; + }; +} diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml new file mode 100644 index 0000000000000000000000000000000000000000..d9c8b711c450b8e16e604f2f77bf02ed3c4315f3 --- /dev/null +++ b/nixos/modules/services/desktops/flatpak.xml @@ -0,0 +1,53 @@ + + +Flatpak + +Source: modules/services/desktop/flatpak.nix + +Upstream documentation: + +Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux. + + + To enable Flatpak, add the following to your configuration.nix: + + + = true; + + + + + For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your configuration.nix: + + + = [ pkgs.xdg-desktop-portal-gtk ]; + + + + + Then, you will need to add a repository, for example, Flathub, either using the following commands: + + + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + flatpak update + + + or by opening the repository file in GNOME Software. + + + + Finally, you can search and install programs: + + + flatpak search bustle + flatpak install flathub org.freedesktop.Bustle + flatpak run org.freedesktop.Bustle + + + Again, GNOME Software offers graphical interface for these tasks. + + diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 543e732127a538661ef801ddf2088f74d195a0be..50477fdd25badbffe0f5d489a3ee5ba1781644c4 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -25,6 +25,7 @@ let ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ssl_dh = <${config.security.dhparams.params.dovecot2.path} disable_plaintext_auth = yes '') @@ -297,10 +298,13 @@ in config = mkIf cfg.enable { - security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - services.dovecot2.protocols = + security.dhparams = mkIf (! isNull cfg.sslServerCert) { + enable = true; + params.dovecot2 = {}; + }; + services.dovecot2.protocols = optional cfg.enableImap "imap" ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 63e976ae566ca08a43f3ad72ec060231c6864dbf..2d0f66de037da1a17e0662feb4555dcb8579c79d 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.gitea; + gitea = cfg.package; pg = config.services.postgresql; usePostgresql = cfg.database.type == "postgres"; configFile = pkgs.writeText "app.ini" '' @@ -57,6 +58,13 @@ in description = "Enable Gitea Service."; }; + package = mkOption { + default = pkgs.gitea; + type = types.package; + defaultText = "pkgs.gitea"; + description = "gitea derivation to use"; + }; + useWizard = mkOption { default = false; type = types.bool; @@ -156,6 +164,30 @@ in }; }; + dump = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable a timer that runs gitea dump to generate backup-files of the + current gitea database and repositories. + ''; + }; + + interval = mkOption { + type = types.str; + default = "04:31"; + example = "hourly"; + description = '' + Run a gitea dump at this interval. Runs by default at 04:31 every day. + + The format is described in + systemd.time + 7. + ''; + }; + }; + appName = mkOption { type = types.str; default = "gitea: Gitea Service"; @@ -203,7 +235,7 @@ in staticRootPath = mkOption { type = types.str; - default = "${pkgs.gitea.data}"; + default = "${gitea.data}"; example = "/var/lib/gitea/data"; description = "Upper level of template and static files path."; }; @@ -223,7 +255,7 @@ in description = "gitea"; after = [ "network.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gitea.bin ]; + path = [ gitea.bin ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; @@ -253,7 +285,7 @@ in HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS @@ -261,7 +293,7 @@ in if [ ! -d ${cfg.stateDir}/conf/locale ] then mkdir -p ${cfg.stateDir}/conf - cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale + cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale fi '' + optionalString (usePostgresql && cfg.database.createDatabase) '' if ! test -e "${cfg.stateDir}/db-created"; then @@ -288,7 +320,7 @@ in User = cfg.user; WorkingDirectory = cfg.stateDir; PermissionsStartOnly = true; - ExecStart = "${pkgs.gitea.bin}/bin/gitea web"; + ExecStart = "${gitea.bin}/bin/gitea web"; Restart = "always"; }; @@ -318,5 +350,32 @@ in name = "gitea-database-password"; text = cfg.database.password; }))); + + systemd.services.gitea-dump = { + description = "gitea dump"; + after = [ "gitea.service" ]; + wantedBy = [ "default.target" ]; + path = [ gitea.bin ]; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + GITEA_WORK_DIR = cfg.stateDir; + }; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + ExecStart = "${gitea.bin}/bin/gitea dump"; + WorkingDirectory = cfg.stateDir; + }; + }; + + systemd.timers.gitea-dump = { + description = "Update timer for gitea-dump"; + partOf = [ "gitea-dump.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.dump.interval; + }; }; } diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 7e880ad09b89650ad6513588413fe46f376fc966..f7441988b272f594c080bdfa195a772fc16dcf4f 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -342,7 +342,7 @@ in { }; database_type = mkOption { type = types.enum [ "sqlite3" "psycopg2" ]; - default = if versionAtLeast config.system.stateVersion "18.03" + default = if versionAtLeast config.system.nixos.stateVersion "18.03" then "psycopg2" else "sqlite3"; description = '' @@ -395,7 +395,14 @@ in { }; url_preview_ip_range_blacklist = mkOption { type = types.listOf types.str; - default = []; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; description = '' List of IP address CIDR ranges that the URL preview spider is denied from accessing. @@ -412,14 +419,7 @@ in { }; url_preview_url_blacklist = mkOption { type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - ]; + default = []; description = '' Optional list of URL matches that the URL preview spider is denied from accessing. diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index effa29b64f63c49e02b75908ecca90c85b936b25..468c7f36ecc5f878e766196d83aca7fdd95cd90a 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -187,7 +187,7 @@ in { systemd.services.mesos-slave = { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ; path = [ pkgs.runtimeShellPackage ]; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/misc/sysprof.nix b/nixos/modules/services/misc/sysprof.nix new file mode 100644 index 0000000000000000000000000000000000000000..ab91a8b586a2322ca858fcd80e7c4ac8b84e755e --- /dev/null +++ b/nixos/modules/services/misc/sysprof.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +{ + options = { + services.sysprof = { + enable = lib.mkEnableOption "sysprof profiling daemon"; + }; + }; + + config = lib.mkIf config.services.sysprof.enable { + environment.systemPackages = [ pkgs.sysprof ]; + + services.dbus.packages = [ pkgs.sysprof ]; + + systemd.packages = [ pkgs.sysprof ]; + }; + + meta.maintainers = pkgs.sysprof.meta.maintainers; +} diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 39a4fd6beff841a23ec390cb913624d88fe3bee3..e2122ddb8ede6409f1310d9b9cbb06dad6287220 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -14,7 +14,7 @@ let (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); - defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then + defaultDataDir = if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/ipfs" else "/var/lib/ipfs/.ipfs"; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 12c2677c3368d47e92811c93909842c94a08f034..39b62bdc7094682fde14de1d0cddf0ef45e059f2 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -260,7 +260,8 @@ in RestartSec = 1; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID"; ProtectSystem = true; - MemoryDenyWriteExecute = true; + # Doesn't work on i686, causing service to fail + MemoryDenyWriteExecute = !pkgs.stdenv.isi686; ProtectHome = true; PrivateTmp = true; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 857657eea4db4f4c1da8148b8a79575ce312f378..6f5e7d8d456e3b702840785e3fd873594dffee3e 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -192,6 +192,7 @@ in security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, + /dev/random r, /dev/urandom r, /etc/passwd r, @@ -211,6 +212,9 @@ in ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr, ${getLib pkgs.libsodium}/lib/libsodium.so.* mr, ${getLib pkgs.systemd}/lib/libsystemd.so.* mr, + ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr, + ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr, + ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr, ${getLib pkgs.xz}/lib/liblzma.so.* mr, ${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr, ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr, diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 20c0b0acf165c1f90cf6f4500fe4d8815cc078fd..c4bd0e7f9eef2808e754bdb324a8ba7b022afd40 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -242,6 +242,9 @@ let # Don't allow traffic to leak out until the script has completed ip46tables -A INPUT -j nixos-drop + + ${cfg.extraStopCommands} + if ${startScript}; then ip46tables -D INPUT -j nixos-drop 2>/dev/null || true else diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix index 02cd53c6fa38069ccbe3feba96091e94cb017c0f..008b09e81a57c811e00d0d753df960795eef7f49 100644 --- a/nixos/modules/services/networking/gnunet.nix +++ b/nixos/modules/services/networking/gnunet.nix @@ -102,6 +102,14 @@ in }; }; + package = mkOption { + type = types.package; + default = pkgs.gnunet; + defaultText = "pkgs.gnunet"; + description = "Overridable attribute of the gnunet package to use."; + example = literalExample "pkgs.gnunet_git"; + }; + extraOptions = mkOption { default = ""; description = '' @@ -130,16 +138,16 @@ in # The user tools that talk to `gnunetd' should come from the same source, # so install them globally. - environment.systemPackages = [ pkgs.gnunet ]; + environment.systemPackages = [ cfg.package ]; systemd.services.gnunet = { description = "GNUnet"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gnunet pkgs.miniupnpc ]; + path = [ cfg.package pkgs.miniupnpc ]; environment.TMPDIR = "/tmp"; serviceConfig.PrivateTemp = true; - serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}"; serviceConfig.User = "gnunet"; serviceConfig.UMask = "0007"; serviceConfig.WorkingDirectory = homeDir; diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index bf2d0916fa36d9013d0bab192e7a79e368a61e51..63f56437d1c8d59935135c80bab173a28c58fc34 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -151,11 +151,6 @@ in config = mkIf cfg.enable { - assertions = [ - { assertion = (cfg.channel >= 1 && cfg.channel <= 13); - message = "channel must be between 1 and 13"; - }]; - environment.systemPackages = [ pkgs.hostapd ]; systemd.services.hostapd = diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 378cd9365848d24bfba48bf6ac4ecf6323d8e1d1..c9ac2ee259901499b62966bba922b3526ce7187b 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -8,10 +8,12 @@ let keepalivedConf = pkgs.writeText "keepalived.conf" '' global_defs { + ${optionalString cfg.enableScriptSecurity "enable_script_security"} ${snmpGlobalDefs} ${cfg.extraGlobalDefs} } + ${vrrpScriptStr} ${vrrpInstancesStr} ${cfg.extraConfig} ''; @@ -26,6 +28,22 @@ let + optionalString enableTraps "enable_traps" ); + vrrpScriptStr = concatStringsSep "\n" (map (s: + '' + vrrp_script ${s.name} { + script "${s.script}" + interval ${toString s.interval} + fall ${toString s.fall} + rise ${toString s.rise} + timeout ${toString s.timeout} + weight ${toString s.weight} + user ${s.user} ${optionalString (s.group != null) s.group} + + ${s.extraConfig} + } + '' + ) vrrpScripts); + vrrpInstancesStr = concatStringsSep "\n" (map (i: '' vrrp_instance ${i.name} { @@ -49,6 +67,18 @@ let ${concatMapStringsSep "\n" virtualIpLine i.virtualIps} } + ${optionalString (builtins.length i.trackScripts > 0) '' + track_script { + ${concatStringsSep "\n" i.trackScripts} + } + ''} + + ${optionalString (builtins.length i.trackInterfaces > 0) '' + track_interface { + ${concatStringsSep "\n" i.trackInterfaces} + } + ''} + ${i.extraConfig} } '' @@ -64,6 +94,12 @@ let notNullOrEmpty = s: !(s == null || s == ""); + vrrpScripts = mapAttrsToList (name: config: + { + inherit name; + } // config + ) cfg.vrrpScripts; + vrrpInstances = mapAttrsToList (iName: iConfig: { name = iName; @@ -86,7 +122,8 @@ let { assertion = !i.vmacXmitBase || i.useVmac; message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set."; } - ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps); + ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps) + ++ flatten (map (vrrpScriptAssertion i.name) i.trackScripts); virtualIpAssertions = vrrpName: ip: [ { assertion = ip.addr != ""; @@ -94,6 +131,11 @@ let } ]; + vrrpScriptAssertion = vrrpName: scriptName: { + assertion = builtins.hasAttr scriptName cfg.vrrpScripts; + message = "services.keepalived.vrrpInstances.${vrrpName} trackscript ${scriptName} is not defined in services.keepalived.vrrpScripts."; + }; + pidFile = "/run/keepalived.pid"; in @@ -110,6 +152,14 @@ in ''; }; + enableScriptSecurity = mkOption { + type = types.bool; + default = false; + description = '' + Don't run scripts configured to be run as root if any part of the path is writable by a non-root user. + ''; + }; + snmp = { enable = mkOption { @@ -181,8 +231,16 @@ in }; + vrrpScripts = mkOption { + type = types.attrsOf (types.submodule (import ./vrrp-script-options.nix { + inherit lib; + })); + default = {}; + description = "Declarative vrrp script config"; + }; + vrrpInstances = mkOption { - type = types.attrsOf (types.submodule (import ./vrrp-options.nix { + type = types.attrsOf (types.submodule (import ./vrrp-instance-options.nix { inherit lib; })); default = {}; diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix similarity index 88% rename from nixos/modules/services/networking/keepalived/vrrp-options.nix rename to nixos/modules/services/networking/keepalived/vrrp-instance-options.nix index 79eff3ae5419809678a2e5a4f0f670d4ced49084..85b9bc3377268d3275e0ef25eeaa07ed0bb2104e 100644 --- a/nixos/modules/services/networking/keepalived/vrrp-options.nix +++ b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix @@ -108,6 +108,20 @@ with lib; description = "Declarative vhost config"; }; + trackScripts = mkOption { + type = types.listOf types.str; + default = []; + example = [ "chk_cmd1" "chk_cmd2" ]; + description = "List of script names to invoke for health tracking."; + }; + + trackInterfaces = mkOption { + type = types.listOf types.str; + default = []; + example = [ "eth0" "eth1" ]; + description = "List of network interfaces to monitor for health tracking."; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix new file mode 100644 index 0000000000000000000000000000000000000000..a3f794c40a89a4166ee9adecd12ac2cc6bd0dade --- /dev/null +++ b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix @@ -0,0 +1,64 @@ +{ lib } : + +with lib; +with lib.types; +{ + options = { + + script = mkOption { + type = str; + example = "\${pkgs.curl} -f http://localhost:80"; + description = "(Path of) Script command to execute followed by args, i.e. cmd [args]..."; + }; + + interval = mkOption { + type = int; + default = 1; + description = "Seconds between script invocations."; + }; + + timeout = mkOption { + type = int; + default = 5; + description = "Seconds after which script is considered to have failed."; + }; + + weight = mkOption { + type = int; + default = 0; + description = "Following a failure, adjust the priority by this weight."; + }; + + rise = mkOption { + type = int; + default = 5; + description = "Required number of successes for OK transition."; + }; + + fall = mkOption { + type = int; + default = 3; + description = "Required number of failures for KO transition."; + }; + + user = mkOption { + type = str; + default = "keepalived_script"; + description = "Name of user to run the script under."; + }; + + group = mkOption { + type = nullOr str; + default = null; + description = "Name of group to run the script under. Defaults to user group."; + }; + + extraConfig = mkOption { + type = lines; + default = ""; + description = "Extra lines to be added verbatim to the vrrp_script section."; + }; + + }; + +} diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index 5526e2ba23ac78a25d5fd4bf8c7633eda4ed53b9..e2f4784059530f48bd152851329b749833cee5b8 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ options, config, pkgs, lib, ... }: with lib; @@ -6,7 +6,11 @@ let cfg = config.services.matterbridge; - matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile); + matterbridgeConfToml = + if cfg.configPath == null then + pkgs.writeText "matterbridge.toml" (cfg.configFile) + else + cfg.configPath; in @@ -15,17 +19,32 @@ in services.matterbridge = { enable = mkEnableOption "Matterbridge chat platform bridge"; + configPath = mkOption { + type = with types; nullOr str; + default = null; + example = "/etc/nixos/matterbridge.toml"; + description = '' + The path to the matterbridge configuration file. + ''; + }; + configFile = mkOption { type = types.str; example = '' - #WARNING: as this file contains credentials, be sure to set correct file permissions [irc] + # WARNING: as this file contains credentials, do not use this option! + # It is kept only for backwards compatibility, and would cause your + # credentials to be in the nix-store, thus with the world-readable + # permission bits. + # Use services.matterbridge.configPath instead. + + [irc] [irc.freenode] Server="irc.freenode.net:6667" Nick="matterbot" [mattermost] [mattermost.work] - #do not prefix it wit http:// or https:// + # Do not prefix it with http:// or https:// Server="yourmattermostserver.domain" Team="yourteam" Login="yourlogin" @@ -44,6 +63,10 @@ in channel="off-topic" ''; description = '' + WARNING: THIS IS INSECURE, as your password will end up in + /nix/store, thus publicly readable. Use + services.matterbridge.configPath instead. + The matterbridge configuration file in the TOML file format. ''; }; @@ -65,32 +88,31 @@ in }; }; - config = mkMerge [ - (mkIf cfg.enable { - - users.extraUsers = mkIf (cfg.user == "matterbridge") [ - { name = "matterbridge"; - group = "matterbridge"; - } ]; - - users.extraGroups = mkIf (cfg.group == "matterbridge") [ - { name = "matterbridge"; - } ]; - - systemd.services.matterbridge = { - description = "Matterbridge chat platform bridge"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; - Restart = "always"; - RestartSec = "10"; - }; + config = mkIf cfg.enable { + warnings = optional options.services.matterbridge.configFile.isDefined + "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; + + users.extraUsers = optional (cfg.user == "matterbridge") + { name = "matterbridge"; + group = "matterbridge"; + }; + + users.extraGroups = optional (cfg.group == "matterbridge") + { name = "matterbridge"; }; - }) - ]; -} + systemd.services.matterbridge = { + description = "Matterbridge chat platform bridge"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; + Restart = "always"; + RestartSec = "10"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 61d063dbfe0e863c6a36c483acba2ace44a87b04..6401631bf62093bdaf91e5ff25d951520417af8c 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -1,23 +1,16 @@ # Module for MiniDLNA, a simple DLNA server. - { config, lib, pkgs, ... }: with lib; let - cfg = config.services.minidlna; - port = 8200; - in { - ###### interface - options = { - services.minidlna.enable = mkOption { type = types.bool; default = false; @@ -43,24 +36,48 @@ in ''; }; + services.minidlna.loglevel = mkOption { + type = types.str; + default = "warn"; + example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; + description = + '' + Defines the type of messages that should be logged, and down to + which level of importance they should be considered. + + The possible types are “artwork”, “database”, “general”, “http”, + “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”. + + The levels are “off”, “fatal”, “error”, “warn”, “info” and + “debug”, listed here in order of decreasing importance. “off” + turns off logging messages entirely, “fatal” logs the most + critical messages only, and so on down to “debug” that logs every + single messages. + + The types are comma-separated, followed by an equal sign (‘=’), + followed by a level that applies to the preceding types. This can + be repeated, separating each of these constructs with a comma. + + Defaults to “general,artwork,database,inotify,scanner,metadata, + http,ssdp,tivo=warn” which logs every type of message at the + “warn” level. + ''; + }; + services.minidlna.config = mkOption { type = types.lines; description = "The contents of MiniDLNA's configuration file."; }; - }; - ###### implementation - config = mkIf cfg.enable { - services.minidlna.config = '' port=${toString port} friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_level=warn + log_level=${cfg.loglevel} inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} @@ -98,7 +115,5 @@ in " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; }; }; - }; - } diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix new file mode 100644 index 0000000000000000000000000000000000000000..1d6c48dd8d378f9cc919f6cd15740eba89b0bac1 --- /dev/null +++ b/nixos/modules/services/networking/ndppd.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ndppd; + + configFile = pkgs.runCommand "ndppd.conf" {} '' + substitute ${pkgs.ndppd}/etc/ndppd.conf $out \ + --replace eth0 ${cfg.interface} \ + --replace 1111:: ${cfg.network} + ''; +in { + options = { + services.ndppd = { + enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + interface = mkOption { + type = types.string; + default = "eth0"; + example = "ens3"; + description = "Interface which is on link-level with router."; + }; + network = mkOption { + type = types.string; + default = "1111::"; + example = "2001:DB8::/32"; + description = "Network that we proxy."; + }; + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.packages = [ pkgs.ndppd ]; + environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile; + systemd.services.ndppd = { + serviceConfig.RuntimeDirectory = [ "ndppd" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 10e96eb403623b977072e339ca42dd4e98a46cac..f4c4adcaaeb897c741cb2cced41fb8a548e2cb74 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -10,7 +10,8 @@ let stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; dns = - if cfg.useDnsmasq then "dnsmasq" + if cfg.dns == "none" then "none" + else if cfg.dns == "dnsmasq" then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" else if config.services.unbound.enable then "unbound" else "default"; @@ -205,14 +206,20 @@ in { }; }; - useDnsmasq = mkOption { - type = types.bool; - default = false; + dns = mkOption { + type = types.enum [ "auto" "dnsmasq" "none" ]; + default = "auto"; description = '' - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. + Options: + - auto: Check for systemd-resolved, unbound, or use default. + - dnsmasq: + Enable NetworkManager's dnsmasq integration. NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + - none: + Disable NetworkManager's DNS integration completely. + It will not touch your /etc/resolv.conf. ''; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 0b52b1d3e302645d21e97e897163b09e579754e0..fc910e59c323d69fe08f02cc732d323435ed74c3 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -20,6 +20,7 @@ let zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0; }; + mkZoneFileName = name: if name == "." then "root" else name; nsdEnv = pkgs.buildEnv { name = "nsd-env"; @@ -50,8 +51,9 @@ let }; writeZoneData = name: text: pkgs.writeTextFile { - inherit name text; - destination = "/zones/${name}"; + name = "nsd-zone-${mkZoneFileName name}"; + inherit text; + destination = "/zones/${mkZoneFileName name}"; }; @@ -146,7 +148,7 @@ let zoneConfigFile = name: zone: '' zone: name: "${name}" - zonefile: "${stateDir}/zones/${name}" + zonefile: "${stateDir}/zones/${mkZoneFileName name}" ${maybeString "outgoing-interface: " zone.outgoingInterface} ${forEach " rrl-whitelist: " zone.rrlWhitelist} ${maybeString "zonestats: " zone.zoneStats} @@ -887,6 +889,12 @@ in config = mkIf cfg.enable { + assertions = singleton { + assertion = zoneConfigs ? "." -> cfg.rootServer; + message = "You have a root zone configured. If this is really what you " + + "want, please enable 'services.nsd.rootServer'."; + }; + environment.systemPackages = [ nsdPkg ]; users.extraGroups = singleton { diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 391f4bdebbabbb3b466738233e94bff01f981586..97ee05046ff02f979ba026fc6ad76c5a6605e0d0 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -9,7 +9,7 @@ let confFile = pkgs.writeText "radicale.conf" cfg.config; # This enables us to default to version 2 while still not breaking configurations of people with version 1 - defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then { + defaultPackage = if versionAtLeast config.system.nixos.stateVersion "17.09" then { pkg = pkgs.radicale2; text = "pkgs.radicale2"; } else { @@ -35,7 +35,7 @@ in defaultText = defaultPackage.text; description = '' Radicale package to use. This defaults to version 1.x if - system.stateVersion < 17.09 and version 2.x + system.nixos.stateVersion < 17.09 and version 2.x otherwise. ''; }; diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix new file mode 100644 index 0000000000000000000000000000000000000000..3fbf6eb60e9d745e5ea7efcd46938a1f7f35f406 --- /dev/null +++ b/nixos/modules/services/networking/stubby.nix @@ -0,0 +1,214 @@ +{ config, lib, pkgs, ...}: + +with lib; + +let + cfg = config.services.stubby; + + fallbacks = concatMapStringsSep "\n " (x: "- ${x}") cfg.fallbackProtocols; + listeners = concatMapStringsSep "\n " (x: "- ${x}") cfg.listenAddresses; + + # By default, the recursive resolvers maintained by the getdns + # project itself are enabled. More information about both getdns's servers, + # as well as third party options for upstream resolvers, can be found here: + # https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers + # + # You can override these values by supplying a yaml-formatted array of your + # preferred upstream resolvers in the following format: + # + # 106 # - address_data: IPv4 or IPv6 address of the upstream + # port: Port for UDP/TCP (default is 53) + # tls_auth_name: Authentication domain name checked against the server + # certificate + # tls_pubkey_pinset: An SPKI pinset verified against the keys in the server + # certificate + # - digest: Only "sha256" is currently supported + # value: Base64 encoded value of the sha256 fingerprint of the public + # key + # tls_port: Port for TLS (default is 853) + + defaultUpstream = '' + - address_data: 145.100.185.15 + tls_auth_name: "dnsovertls.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4= + - address_data: 145.100.185.16 + tls_auth_name: "dnsovertls1.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA= + - address_data: 185.49.141.37 + tls_auth_name: "getdnsapi.net" + tls_pubkey_pinset: + - digest: "sha256" + value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q= + - address_data: 2001:610:1:40ba:145:100:185:15 + tls_auth_name: "dnsovertls.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4= + - address_data: 2001:610:1:40ba:145:100:185:16 + tls_auth_name: "dnsovertls1.sinodun.com" + tls_pubkey_pinset: + - digest: "sha256" + value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA= + - address_data: 2a04:b900:0:100::38 + tls_auth_name: "getdnsapi.net" + tls_pubkey_pinset: + - digest: "sha256" + value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q= + ''; + + # Resolution type is not changeable here because it is required per the + # stubby documentation: + # + # "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby + # operation." + # + # https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby + + confFile = pkgs.writeText "stubby.yml" '' + resolution_type: GETDNS_RESOLUTION_STUB + dns_transport_list: + ${fallbacks} + tls_authentication: ${cfg.authenticationMode} + tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize} + edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"} + idle_timeout: ${toString cfg.idleTimeout} + listen_addresses: + ${listeners} + round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"} + ${cfg.extraConfig} + upstream_recursive_servers: + ${cfg.upstreamServers} + ''; +in + +{ + options = { + services.stubby = { + + enable = mkEnableOption "Stubby DNS resolver"; + + fallbackProtocols = mkOption { + default = [ "GETDNS_TRANSPORT_TLS" ]; + type = with types; listOf (enum [ + "GETDNS_TRANSPORT_TLS" + "GETDNS_TRANSPORT_TCP" + "GETDNS_TRANSPORT_UDP" + ]); + description = '' + Ordered list composed of one or more transport protocols. + Strict mode should only use GETDNS_TRANSPORT_TLS. + Other options are GETDNS_TRANSPORT_UDP and + GETDNS_TRANSPORT_TCP. + ''; + }; + + authenticationMode = mkOption { + default = "GETDNS_AUTHENTICATION_REQUIRED"; + type = types.enum [ + "GETDNS_AUTHENTICATION_REQUIRED" + "GETDNS_AUTHENTICATION_NONE" + ]; + description = '' + Selects the Strict or Opportunistic usage profile. + For strict, set to GETDNS_AUTHENTICATION_REQUIRED. + for opportunistic, use GETDNS_AUTHENTICATION_NONE. + ''; + }; + + queryPaddingBlocksize = mkOption { + default = 128; + type = types.int; + description = '' + EDNS0 option to pad the size of the DNS query to the given blocksize. + ''; + }; + + subnetPrivate = mkOption { + default = true; + type = types.bool; + description = '' + EDNS0 option for ECS client privacy. Default is + true. If set, this option prevents the client + subnet from being sent to authoritative nameservers. + ''; + }; + + idleTimeout = mkOption { + default = 10000; + type = types.int; + description = "EDNS0 option for keepalive idle timeout expressed in + milliseconds."; + }; + + listenAddresses = mkOption { + default = [ "127.0.0.1" "0::1" ]; + type = with types; listOf str; + description = '' + Sets the listen address for the stubby daemon. + Uses port 53 by default. + Ise IP@port to specify a different port. + ''; + }; + + roundRobinUpstreams = mkOption { + default = true; + type = types.bool; + description = '' + Instructs stubby to distribute queries across all available name + servers. Default is true. Set to + false in order to use the first available. + ''; + }; + + upstreamServers = mkOption { + default = defaultUpstream; + type = types.lines; + description = '' + Add additional upstreams. See stubby + 1 for an + example of the entry formatting. In Strict mode, at least one of the + following settings must be supplied for each nameserver: + tls_auth_name or + tls_pubkey_pinset. + ''; + }; + + debugLogging = mkOption { + default = false; + type = types.bool; + description = "Enable or disable debug level logging."; + }; + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Add additional configuration options. see + stubby1 + for more options. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.stubby ]; + systemd.services.stubby = { + description = "Stubby local DNS resolver"; + after = [ "network.target" ]; + before = [ "nss-lookup.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}"; + DynamicUser = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 0591917c742381755eb7921cdfea6ece446d8358..acb4778d8485fefea5af9f64d07c9a5548fc21c7 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -193,7 +193,7 @@ let after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; - path = with pkgs; [ kmod iproute wireguard ]; + path = with pkgs; [ kmod iproute wireguard-tools ]; serviceConfig = { Type = "oneshot"; @@ -279,7 +279,7 @@ in config = mkIf (cfg.interfaces != {}) { boot.extraModulePackages = [ kernel.wireguard ]; - environment.systemPackages = [ pkgs.wireguard ]; + environment.systemPackages = [ pkgs.wireguard-tools ]; systemd.services = mapAttrs' generateUnit cfg.interfaces; diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 7f09e8893c4d0556641e6e530026f87a2c7fc2aa..137c3d610186caadb783beb6c4a2331abf74b7fe 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -133,6 +133,7 @@ in { ReadOnlyDirectories = "/"; ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; RuntimeDirectory = "sshguard"; + StateDirectory = "sshguard"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; }; }; diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index f6a5ce73a12b0c1e701115e8e0aa2f1253b39baa..d5bd0f12febbeef4dc0133cc67a72eb9fb54fab7 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -42,6 +42,34 @@ in default = 8081; description = "Port to listen on."; }; + + jvmOpts = mkOption { + type = types.lines; + default = '' + -Xms1200M + -Xmx1200M + -XX:MaxDirectMemorySize=2G + -XX:+UnlockDiagnosticVMOptions + -XX:+UnsyncloadClass + -XX:+LogVMOutput + -XX:LogFile=${cfg.home}/nexus3/log/jvm.log + -XX:-OmitStackTraceInFastThrow + -Djava.net.preferIPv4Stack=true + -Dkaraf.home=${pkgs.nexus} + -Dkaraf.base=${pkgs.nexus} + -Dkaraf.etc=${pkgs.nexus}/etc/karaf + -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties + -Dkaraf.data=${cfg.home}/nexus3 + -Djava.io.tmpdir=${cfg.home}/nexus3/tmp + -Dkaraf.startLocalConsole=false + ''; + + description = '' + Options for the JVM written to `nexus.jvmopts`. + Please refer to the docs (https://help.sonatype.com/repomanager3/installation/configuring-the-runtime-environment) + for further information. + ''; + }; }; }; @@ -63,13 +91,13 @@ in environment = { NEXUS_USER = cfg.user; NEXUS_HOME = cfg.home; + + VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts; }; preStart = '' mkdir -p ${cfg.home}/nexus3/etc - ln -sf ${cfg.home} /run/sonatype-work - chown -R ${cfg.user}:${cfg.group} ${cfg.home} if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then @@ -77,10 +105,10 @@ in echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties else - sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties - sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties - sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties - sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties + sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties fi ''; diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 2124a42f01a1c18b982c186d0de80d722d53b45a..fe65fba42a468013195f21cb2e4cc15b15c55528 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -66,7 +66,7 @@ in { description = "Caddy web server"; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - environment = mkIf (versionAtLeast config.system.stateVersion "17.09") + environment = mkIf (versionAtLeast config.system.nixos.stateVersion "17.09") { CADDYPATH = cfg.dataDir; }; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 815c3147e647dee44f897e219b119e133bac6b0b..0aa780bf6da163e146da048d76288aad17f18dcc 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -38,6 +38,7 @@ let ${toString (flip mapAttrsToList upstream.servers (name: server: '' server ${name} ${optionalString server.backup "backup"}; ''))} + ${upstream.extraConfig} } '')); @@ -492,6 +493,13 @@ in ''; default = {}; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + These lines go to the end of the upstream verbatim. + ''; + }; }; }); description = '' diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index f014d817e80e86426b338c56093e7d1205adb0c5..e4494dff37da8f30d9f7f34827720f5dc7b43e2f 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -62,6 +62,7 @@ with lib; This is useful if you have many subdomains and want to avoid hitting the rate limit. Alternately, you can generate a certificate through . + Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using . ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 10e8ef0ed381798e377ebd887d98d7e71d067312..27b62df7097ca7dfc245a2dcb7788e684a4168bf 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -120,6 +120,7 @@ in { services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ]; systemd.packages = [ pkgs.gnome3.vino ]; + services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 29752ff405e2d9000666e921b8d5ba9723e9406c..6ff1ef0e4c9a3b5cc240d13a851666b51c9eca87 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -12,6 +12,7 @@ in options = { services.xserver.desktopManager.xterm.enable = mkOption { + type = types.bool; default = true; description = "Enable a xterm terminal as a desktop manager."; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 70fc7388c2acdfc1ea1f38b282378b089cf26b99..a6a38a21b61729e74b94ba8886ebbe92e8f17eb2 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -135,6 +135,9 @@ in systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; + # Allow choosing an user account + services.accounts-daemon.enable = true; + services.dbus.packages = [ gdm ]; systemd.user.services.dbus.wantedBy = [ "default.target" ]; diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index 3d3f2e0028c07c5118a9a8c4a09e636ddc761573..27a17178476a05a3c4a584d6aa240c6e4b0ee34e 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -15,10 +15,10 @@ in services.xserver.windowManager.session = singleton { name = "stumpwm"; start = '' - ${pkgs.stumpwm}/bin/stumpwm & + ${pkgs.lispPackages.stumpwm}/bin/stumpwm & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.stumpwm ]; + environment.systemPackages = [ pkgs.lispPackages.stumpwm ]; }; } diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 87a4ab2a586df7e539fd83ca65d2545035ce7cc0..2ce04ed5342c4c3d0a44060b582cf03b2ddddcf5 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -4,6 +4,7 @@ use strict; use warnings; use File::Basename; use File::Slurp; +use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; @@ -67,17 +68,15 @@ EOF $SIG{PIPE} = "IGNORE"; sub getActiveUnits { - # FIXME: use D-Bus or whatever to query this, since parsing the - # output of list-units is likely to break. - # Use current version of systemctl binary before daemon is reexeced. - my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`; + my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); + my $units = $mgr->ListUnitsByPatterns([], []); my $res = {}; - foreach my $line (split '\n', $lines) { - chomp $line; - last if $line eq ""; - $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; - next if $1 eq "UNIT"; - $res->{$1} = { load => $2, state => $3, substate => $4 }; + for my $item (@$units) { + my ($id, $description, $load_state, $active_state, $sub_state, + $following, $unit_path, $job_id, $job_type, $job_path) = @$item; + next unless $following eq ''; + next if $job_id == 0 and $active_state eq 'inactive'; + $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; } return $res; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 091a2e412eeda91be63803ed45fbc0a1ddc90615..e2d1dd49ef0ecc07eb7632100fbb35ea9195c3f1 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -127,7 +127,8 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); # Replace runtime dependencies diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix index b27a35b6257da4e802c04a4926e1b67625e6567b..30f367da766634477a1f7a96e536ad1c5082c6c0 100644 --- a/nixos/modules/system/boot/coredump.nix +++ b/nixos/modules/system/boot/coredump.nix @@ -15,8 +15,11 @@ with lib; Enables storing core dumps in systemd. Note that this alone is not enough to enable core dumps. The maximum file size for core dumps must be specified in limits.conf as well. See - as well as the limits.conf(5) - man page. + and the limits.conf(5) + man page (these specify the core dump limits for user login sessions) + and (where e.g. + DefaultLimitCORE=1000000 can be specified to set + the core dump limit for systemd system-level services). ''; }; diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix index 1e6f9e442b679913779dac6938f0805ef8c96f9c..8c9b1502558af1c464e8cc9ecc1851a263492439 100644 --- a/nixos/modules/system/boot/grow-partition.nix +++ b/nixos/modules/system/boot/grow-partition.nix @@ -30,7 +30,7 @@ with lib; boot.initrd.postDeviceCommands = '' rootDevice="${config.fileSystems."/".device}" - if [ -e "$rootDevice" ]; then + if waitDevice "$rootDevice"; then rootDevice="$(readlink -f "$rootDevice")" parentDevice="$rootDevice" while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 54dfb53fd30ffba7c716ca46a89a86e31225cc6d..7ebfdb134d7d00ea566d1752d43a2029b520c76c 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -454,7 +454,6 @@ in ["firewire_ohci" "firewire_core" "firewire_sbp2"]; # Some modules that may be needed for mounting anything ciphered - # Also load input_leds to get caps lock light working (#12456) boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ] ++ luks.cryptoModules # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index f8fb8a64cb9b8a3c0b805e713d259d9c7a9e7da9..e4223bae7d32f9b8ddc49e78ff8f4d213a9609a4 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -87,9 +87,10 @@ in systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ]; systemd.services.plymouth-halt.wantedBy = [ "halt.target" ]; + systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ]; systemd.services.plymouth-quit = { wantedBy = [ "multi-user.target" ]; - after = [ "display-manager.service" "multi-user.target" ]; + after = [ "display-manager.service" ]; }; systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 964ec68cfe2f81ea838dbe35aed507a49f1fbcf9..92e68b72664a08b70c696bbdbab7addaebc7cab9 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -74,6 +74,32 @@ ln -s /proc/mounts /etc/mtab # to shut up mke2fs touch /etc/udev/hwdb.bin # to shut up udev touch /etc/initrd-release +# Function for waiting a device to appear. +waitDevice() { + local device="$1" + + # USB storage devices tend to appear with some delay. It would be + # great if we had a way to synchronously wait for them, but + # alas... So just wait for a few seconds for the device to + # appear. + if test ! -e $device; then + echo -n "waiting for device $device to appear..." + try=20 + while [ $try -gt 0 ]; do + sleep 1 + # also re-try lvm activation now that new block devices might have appeared + lvm vgchange -ay + # and tell udev to create nodes for the new LVs + udevadm trigger --action=add + if test -e $device; then break; fi + echo -n "." + try=$((try - 1)) + done + echo + [ $try -ne 0 ] + fi +} + # Mount special file systems. specialMount() { local device="$1" @@ -377,40 +403,7 @@ lustrateRoot () { exec 4>&- } -# Function for waiting a device to appear. -waitDevice() { - local device="$1" - - # USB storage devices tend to appear with some delay. It would be - # great if we had a way to synchronously wait for them, but - # alas... So just wait for a few seconds for the device to - # appear. - if test ! -e $device; then - echo -n "waiting for device $device to appear..." - try=20 - while [ $try -gt 0 ]; do - sleep 1 - # also re-try lvm activation now that new block devices might have appeared - lvm vgchange -ay - # and tell udev to create nodes for the new LVs - udevadm trigger --action=add - if test -e $device; then break; fi - echo -n "." - try=$((try - 1)) - done - echo - [ $try -ne 0 ] - fi -} - -# Try to resume - all modules are loaded now. -if test -e /sys/power/tuxonice/resume; then - if test -n "$(cat /sys/power/tuxonice/resume)"; then - echo 0 > /sys/power/tuxonice/user_interface/enabled - echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..." - fi -fi if test -e /sys/power/resume -a -e /sys/power/disk; then if test -n "@resumeDevice@" && waitDevice "@resumeDevice@"; then diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 7c01f8ea9b7fd8d14437ce281fd63765adf17dd9..ae9ee8811f77474215079948585dbe616548b9af 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -2,9 +2,10 @@ with lib; -let cfg = config.systemd; in - -rec { +let + cfg = config.systemd; + lndir = "${pkgs.xorg.lndir}/bin/lndir"; +in rec { shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); @@ -136,7 +137,13 @@ rec { for i in ${toString cfg.packages}; do for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do if ! [[ "$fn" =~ .wants$ ]]; then - ln -s $fn $out/ + if [[ -d "$fn" ]]; then + targetDir="$out/$(basename "$fn")" + mkdir -p "$targetDir" + ${lndir} "$fn" "$targetDir" + else + ln -s $fn $out/ + fi fi done done @@ -151,7 +158,7 @@ rec { if [ "$(readlink -f $i/$fn)" = /dev/null ]; then ln -sfn /dev/null $out/$fn else - mkdir $out/$fn.d + mkdir -p $out/$fn.d ln -s $i/$fn $out/$fn.d/overrides.conf fi else diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 5255f1a1b97a59ad9f01567f1fecd93081ae29ff..2cff25a8c854f587e5637fc778aba38b92e0016d 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -217,7 +217,7 @@ in rec { environment = mkOption { default = {}; - type = with types; attrsOf (nullOr (either str package)); + type = with types; attrsOf (nullOr (either str (either path package))); example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; description = "Environment variables passed to the service's processes."; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 41dec2af9ed431e94052b13e41e558b31c875119..3d46ba72493c7e26397bad52abb6536fb154b68b 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -58,6 +58,9 @@ in systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; + # Only use a serial console, no TTY. + virtualisation.qemu.consoles = [ qemuSerialDevice ]; + boot.initrd.preDeviceCommands = '' echo 600 > /proc/sys/kernel/hung_task_timeout_secs @@ -126,6 +129,9 @@ in users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.job.logToJournal = true; + + # set default stateVersion to avoid warnings during eval + system.nixos.stateVersion = mkDefault "18.03"; }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index f74c42a777f53a069405191754a24579a026a78c..e9e935e90202e09113d2f5cbd817ed50ea798e48 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -48,13 +48,6 @@ let cfg = config.ec2; in boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; boot.loader.timeout = 0; - boot.initrd.postDeviceCommands = - '' - # Force udev to exit to prevent random "Device or resource busy - # while trying to open /dev/xvda" errors from fsck. - udevadm control --exit || true - ''; - boot.initrd.network.enable = true; # Mount all formatted ephemeral disks and activate all swap devices. diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 349fd3adfc96cec8d3730249d67f58519b794962..9ecdcf23e5fbfd73bc77b44e2e89d120b7dbbc07 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -3,7 +3,7 @@ options = { ec2 = { hvm = lib.mkOption { - default = lib.versionAtLeast config.system.stateVersion "17.03"; + default = lib.versionAtLeast config.system.nixos.stateVersion "17.03"; internal = true; description = '' Whether the EC2 instance is a HVM instance. diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 248c2fc1fb2387f8d548b967640f59e49b00cd4c..c3044ea124cfc588cdf5fc0676f8a8a80cbb4655 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -606,8 +606,8 @@ in { config, pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql96; - - system.stateVersion = "17.03"; + + system.nixos.stateVersion = "17.03"; }; }; } diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix new file mode 100644 index 0000000000000000000000000000000000000000..e0d2b3dc509de3e765bbd30089bacfef970946db --- /dev/null +++ b/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.qemuGuest; +in { + + options.services.qemuGuest = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the qemu guest agent."; + }; + }; + + config = mkIf cfg.enable ( + mkMerge [ + { + + services.udev.extraRules = '' + SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service" + ''; + + systemd.services.qemu-guest-agent = { + description = "Run the QEMU Guest Agent"; + serviceConfig = { + ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga"; + Restart = "always"; + RestartSec = 0; + }; + }; + } + ] + ); +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 66ff43c8547d77567fde14259070c625bea0f03c..0abf7b11703c1e4f607bd776b667b66ea6c1d379 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -23,9 +23,9 @@ let cfg = config.virtualisation; - qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; - ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; + qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic"; + + consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; # XXX: This is very ugly and in the future we really should use attribute # sets to build ALL of the QEMU flags instead of this mixed mess of Nix @@ -108,7 +108,7 @@ let ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ - -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ + -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \ ''} \ $extraDisks \ ${qemuGraphics} \ @@ -248,9 +248,10 @@ in default = true; description = '' - Whether to run QEMU with a graphics window, or access - the guest computer serial port through the host tty. - ''; + Whether to run QEMU with a graphics window, or in nographic mode. + Serial console will be enabled on both settings, but this will + change the preferred console. + ''; }; virtualisation.cores = @@ -332,6 +333,23 @@ in description = "Options passed to QEMU."; }; + consoles = mkOption { + type = types.listOf types.str; + default = let + consoles = [ "${qemuSerialDevice},115200n8" "tty0" ]; + in if cfg.graphics then consoles else reverseList consoles; + example = [ "console=tty1" ]; + description = '' + The output console devices to pass to the kernel command line via the + console parameter, the primary console is the last + item of this list. + + By default it enables both serial console and + tty0. The preferred console (last one) is based on + the value of . + ''; + }; + networkingOptions = mkOption { default = [ @@ -356,6 +374,15 @@ in type = types.enum [ "virtio" "scsi" "ide" ]; description = "The interface used for the virtual hard disks."; }; + + guestAgent.enable = + mkOption { + default = true; + type = types.bool; + description = '' + Enable the Qemu guest agent. + ''; + }; }; virtualisation.useBootLoader = @@ -507,6 +534,8 @@ in # Don't run ntpd in the guest. It should get the correct time from KVM. services.timesyncd.enable = false; + services.qemuGuest.enable = cfg.qemu.guestAgent.enable; + system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; } '' mkdir -p $out/bin diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e010b532a688b1f6a40d436acbdc8fccde02638c..989764874c48565071b3bb9b57d55c2b35bda863 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,6 +58,8 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) + (all nixos.tests.containers-imperative) + (all nixos.tests.containers-ipv4) nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) @@ -98,6 +100,7 @@ in rec { (all nixos.tests.misc) (all nixos.tests.mutableUsers) (all nixos.tests.nat.firewall) + (all nixos.tests.nat.firewall-conntrack) (all nixos.tests.nat.standalone) (all nixos.tests.networking.scripted.loopback) (all nixos.tests.networking.scripted.static) @@ -112,6 +115,10 @@ in rec { (all nixos.tests.nfs4) (all nixos.tests.openssh) (all nixos.tests.php-pcre) + (all nixos.tests.predictable-interface-names.predictable) + (all nixos.tests.predictable-interface-names.unpredictable) + (all nixos.tests.predictable-interface-names.predictableNetworkd) + (all nixos.tests.predictable-interface-names.unpredictableNetworkd) (all nixos.tests.printing) (all nixos.tests.proxy) (all nixos.tests.sddm.default) diff --git a/nixos/release.nix b/nixos/release.nix index 5b6640f1d3ccf8fc492433bbd89b7fd63ee50444..f7c2943b96fad108f2e34370645539b2eabe8294 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -198,6 +198,7 @@ in rec { modules = singleton ({ config, pkgs, ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; + system.nixos.stateVersion = mkDefault "18.03"; }); }).config.system.build.toplevel; preferLocalBuild = true; @@ -269,6 +270,7 @@ in rec { tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; tests.deluge = callTest tests/deluge.nix {}; + tests.dhparams = callTest tests/dhparams.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; @@ -283,8 +285,8 @@ in rec { tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; + tests.flatpak = callTest tests/flatpak.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; @@ -313,10 +315,7 @@ in rec { tests.plotinus = callTest tests/plotinus.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; - tests.kafka_0_9 = callTest tests/kafka_0_9.nix {}; - tests.kafka_0_10 = callTest tests/kafka_0_10.nix {}; - tests.kafka_0_11 = callTest tests/kafka_0_11.nix {}; - tests.kafka_1_0 = callTest tests/kafka_1_0.nix {}; + tests.kafka = callSubTests tests/kafka.nix {}; tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; @@ -348,6 +347,7 @@ in rec { tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete tests.networkingProxy = callTest tests/networking-proxy.nix {}; + tests.nexus = callTest tests/nexus.nix { }; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nginx = callTest tests/nginx.nix { }; @@ -360,7 +360,6 @@ in rec { tests.openldap = callTest tests/openldap.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; - #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; @@ -399,9 +398,11 @@ in rec { tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {}; tests.wordpress = callTest tests/wordpress.nix {}; tests.xautolock = callTest tests/xautolock.nix {}; + tests.xdg-desktop-portal = callTest tests/xdg-desktop-portal.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; tests.xrdp = callTest tests/xrdp.nix {}; + tests.xss-lock = callTest tests/xss-lock.nix {}; tests.yabar = callTest tests/yabar.nix {}; tests.zookeeper = callTest tests/zookeeper.nix {}; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index d7452744e17b2e0d05b66c8a744b4f31f722d177..21b0fedcfefe69a71eed18f3bc948bb9107ead82 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -54,9 +54,11 @@ in import ./make-test.nix { }; testScript = '' + $letsencrypt->waitForUnit("default.target"); $letsencrypt->waitForUnit("boulder.service"); - startAll; + $webserver->waitForUnit("default.target"); $webserver->waitForUnit("acme-certificates.target"); + $client->waitForUnit("default.target"); $client->succeed('curl https://example.com/ | grep -qF "hello world"'); ''; } diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix index 10cde45d18a8bc98ee904ab87b9438a33d2b0729..7c6b3b29e36dc905445aade8905038075c09e6f6 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt.nix @@ -386,6 +386,10 @@ in { services.nginx.enable = true; services.nginx.recommendedProxySettings = true; + # This fixes the test on i686 + services.nginx.commonHttpConfig = '' + server_names_hash_bucket_size 64; + ''; services.nginx.virtualHosts.${wfeDomain} = { onlySSL = true; enableACME = false; diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 015b79b1cee6ec28224bcdf0ce9874b571eb4527..a548b17b1ff1acb0897c25bc1cac6c9cc82959d8 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -17,7 +17,9 @@ import ./make-test.nix ({ pkgs, ...} : { emptyContainer = import ../lib/eval-config.nix { inherit (config.nixpkgs.localSystem) system; modules = lib.singleton { - containers.foo.config = {}; + containers.foo.config = { + system.nixos.stateVersion = "18.03"; + }; }; }; in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ]; diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 31d05990a679bced0fc7db074f791fdcba306483..821ce1cd07d2b37c4c47cdfb8ead5603d8d88b15 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowPing = true; + system.nixos.stateVersion = "18.03"; }; }; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix new file mode 100644 index 0000000000000000000000000000000000000000..d11dfeec5d0c178af286bfa4dd7601e8de4ff265 --- /dev/null +++ b/nixos/tests/dhparams.nix @@ -0,0 +1,144 @@ +let + common = { pkgs, ... }: { + security.dhparams.enable = true; + environment.systemPackages = [ pkgs.openssl ]; + }; + +in import ./make-test.nix { + name = "dhparams"; + + nodes.generation1 = { pkgs, config, ... }: { + imports = [ common ]; + security.dhparams.params = { + # Use low values here because we don't want the test to run for ages. + foo.bits = 16; + # Also use the old format to make sure the type is coerced in the right + # way. + bar = 17; + }; + + systemd.services.foo = { + description = "Check systemd Ordering"; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + # This is to make sure that the dhparams generation of foo occurs + # before this service so we need this service to start as early as + # possible to provoke a race condition. + DefaultDependencies = false; + + # We check later whether the service has been started or not. + ConditionPathExists = config.security.dhparams.params.foo.path; + }; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + # The reason we only provide an ExecStop here is to ensure that we don't + # accidentally trigger an error because a file system is not yet ready + # during very early startup (we might not even have the Nix store + # available, for example if future changes in NixOS use systemd mount + # units to do early file system initialisation). + serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true"; + }; + }; + + nodes.generation2 = { + imports = [ common ]; + security.dhparams.params.foo.bits = 18; + }; + + nodes.generation3 = common; + + nodes.generation4 = { + imports = [ common ]; + security.dhparams.stateful = false; + security.dhparams.params.foo2.bits = 18; + security.dhparams.params.bar2.bits = 19; + }; + + nodes.generation5 = { + imports = [ common ]; + security.dhparams.defaultBitSize = 30; + security.dhparams.params.foo3 = {}; + security.dhparams.params.bar3 = {}; + }; + + testScript = { nodes, ... }: let + getParamPath = gen: name: let + node = "generation${toString gen}"; + in nodes.${node}.config.security.dhparams.params.${name}.path; + + assertParamBits = gen: name: bits: let + path = getParamPath gen name; + in '' + $machine->nest('check bit size of ${path}', sub { + my $out = $machine->succeed('openssl dhparam -in ${path} -text'); + $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m; + die "bit size should be ${toString bits} but it is $1 instead." + if $1 != ${toString bits}; + }); + ''; + + switchToGeneration = gen: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.system.build) toplevel; + switchCmd = "${toplevel}/bin/switch-to-configuration test"; + in '' + $machine->nest('switch to generation ${toString gen}', sub { + $machine->succeed('${switchCmd}'); + $main::machine = ''$${node}; + }); + ''; + + in '' + my $machine = $generation1; + + $machine->waitForUnit('multi-user.target'); + + subtest "verify startup order", sub { + $machine->succeed('systemctl is-active foo.service'); + }; + + subtest "check bit sizes of dhparam files", sub { + ${assertParamBits 1 "foo" 16} + ${assertParamBits 1 "bar" 17} + }; + + ${switchToGeneration 2} + + subtest "check whether bit size has changed", sub { + ${assertParamBits 2 "foo" 18} + }; + + subtest "ensure that dhparams file for 'bar' was deleted", sub { + $machine->fail('test -e ${getParamPath 1 "bar"}'); + }; + + ${switchToGeneration 3} + + subtest "ensure that 'security.dhparams.path' has been deleted", sub { + $machine->fail( + 'test -e ${nodes.generation3.config.security.dhparams.path}' + ); + }; + + ${switchToGeneration 4} + + subtest "check bit sizes dhparam files", sub { + ${assertParamBits 4 "foo2" 18} + ${assertParamBits 4 "bar2" 19} + }; + + subtest "check whether dhparam files are in the Nix store", sub { + $machine->succeed( + 'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}', + 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}', + ); + }; + + ${switchToGeneration 5} + + subtest "check whether defaultBitSize works as intended", sub { + ${assertParamBits 5 "foo3" 30} + ${assertParamBits 5 "bar3" 30} + }; + ''; +} diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 845623368250cf405125d2b28ee6c392f3dc8f60..1fcf3903b13e9f0c68ad3c08bbe98b98b879b66d 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -26,7 +26,8 @@ import ./make-test.nix ({ pkgs, ... }: { $client->waitForUnit("dnsmasq"); # The daemon is socket activated; sending a single ping should activate it. + $client->fail("systemctl is-active dnscrypt-proxy"); $client->execute("${pkgs.iputils}/bin/ping -c1 example.com"); - $client->succeed("systemctl is-active dnscrypt-proxy"); + $client->waitUntilSucceeds("systemctl is-active dnscrypt-proxy"); ''; }) diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix new file mode 100644 index 0000000000000000000000000000000000000000..d1c7cf843147e6d4e85417d4ab237980c8167bf8 --- /dev/null +++ b/nixos/tests/flatpak.nix @@ -0,0 +1,23 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "flatpak"; + meta = { + maintainers = pkgs.flatpak.meta.maintainers; + }; + + machine = { config, pkgs, ... }: { + imports = [ ./common/x11.nix ]; + services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work + services.flatpak.enable = true; + environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ]; + virtualisation.memorySize = 2047; + virtualisation.diskSize = 1024; + }; + + testScript = '' + $machine->waitForX(); + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak.installedTests}/share' --timeout 3600"); + ''; +}) diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix deleted file mode 100644 index 67c95446526f88c08b5797e52a3780b4d8a21abe..0000000000000000000000000000000000000000 --- a/nixos/tests/fleet.nix +++ /dev/null @@ -1,76 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : rec { - name = "simple"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - nodes = { - node1 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node1:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node1"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - node2 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node2:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node2"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - }; - - service = builtins.toFile "hello.service" '' - [Unit] - Description=Hello World - - [Service] - ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done" - - [X-Fleet] - MachineMetadata=name=node2 - ''; - - testScript = - '' - startAll; - $node1->waitForUnit("fleet.service"); - $node2->waitForUnit("fleet.service"); - - $node2->waitUntilSucceeds("fleetctl list-machines | grep node1"); - $node1->waitUntilSucceeds("fleetctl list-machines | grep node2"); - - $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service"); - $node1->succeed("fleetctl list-unit-files | grep hello"); - $node1->succeed("fleetctl start hello.service"); - $node1->waitUntilSucceeds("fleetctl list-units | grep running"); - $node1->succeed("fleetctl stop hello.service"); - $node1->succeed("fleetctl destroy hello.service"); - ''; -}) diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index a22ef224580a7852a9e82de7105ec8012864ebcf..5a1f50bd29b181181a8283f12ef82b86840ce072 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -4,6 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { one = { config, pkgs, ... }: { + virtualisation.memorySize = 1024; time.timeZone = "UTC"; services.graphite = { web.enable = true; @@ -21,12 +22,17 @@ import ./make-test.nix ({ pkgs, ...} : testScript = '' startAll; $one->waitForUnit("default.target"); - $one->requireActiveUnit("graphiteWeb.service"); - $one->requireActiveUnit("graphiteApi.service"); - $one->requireActiveUnit("graphitePager.service"); - $one->requireActiveUnit("carbonCache.service"); - $one->requireActiveUnit("seyren.service"); - $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); - $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") + $one->waitForUnit("graphiteWeb.service"); + $one->waitForUnit("graphiteApi.service"); + $one->waitForUnit("graphitePager.service"); + $one->waitForUnit("carbonCache.service"); + $one->waitForUnit("seyren.service"); + # The services above are of type "simple". systemd considers them active immediately + # even if they're still in preStart (which takes quite long for graphiteWeb). + # Wait for ports to open so we're sure the services are up and listening. + $one->waitForOpenPort(8080); + $one->waitForOpenPort(2003); + $one->succeed("echo \"foo 1 `date +%s`\" | nc -N localhost 2003"); + $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"); ''; }) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index cb33b69e7199037902081f1b737330953f2c2c73..0a0639d62796dbfafe312e24b6d0a69b73c771b3 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -25,16 +25,18 @@ import ./make-test.nix ({ pkgs, ...} : { testScript = '' + $machine->waitForUnit("multi-user.target"); + # Test hidepid subtest "hidepid", sub { $machine->succeed("grep -Fq hidepid=2 /proc/mounts"); - $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]"); - $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]"); + # cannot use pgrep -u here, it segfaults when access to process info is denied + $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]"); + $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]"); }; # Test kernel module hardening subtest "lock-modules", sub { - $machine->waitForUnit("multi-user.target"); # note: this better a be module we normally wouldn't load ... $machine->fail("modprobe dccp"); }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 4ebccb7ab868f967a0368e84f495056785f3d02a..797706a062cae38578983be3f0cfbfb2d3150777 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -65,12 +65,13 @@ in { $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light"); $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'"); - # Check that no errors were logged - $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR"); - # Print log to ease debugging my $log = $hass->succeed("cat ${configDir}/home-assistant.log"); print "\n### home-assistant.log ###\n"; print "$log\n"; + + # Check that no errors were logged + # The timer can get out of sync due to Hydra's load, so this error is ignored + $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR"); ''; }) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index acf248d0a5a664c393fb2e44a0613651fb9d75cf..7da02d9c204aa37c34c04c16c972d084f7e67198 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -241,6 +241,7 @@ let nixos-artwork.wallpapers.gnome-dark perlPackages.XMLLibXML perlPackages.ListCompare + xorg.lndir # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix new file mode 100644 index 0000000000000000000000000000000000000000..e48b25d67df39c23571a364728c586cc54db61d8 --- /dev/null +++ b/nixos/tests/kafka.nix @@ -0,0 +1,69 @@ +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; + +let + makeKafkaTest = name: kafkaPackage: (makeTest { + inherit name; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + zookeeper1 = { config, ... }: { + services.zookeeper = { + enable = true; + }; + + networking.firewall.allowedTCPPorts = [ 2181 ]; + virtualisation.memorySize = 1024; + }; + kafka = { config, ... }: { + services.apache-kafka = { + enable = true; + extraProperties = '' + offsets.topic.replication.factor = 1 + zookeeper.session.timeout.ms = 600000 + ''; + package = kafkaPackage; + zookeeper = "zookeeper1:2181"; + # These are the default options, but UseCompressedOops doesn't work with 32bit JVM + jvmOptions = [ + "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled" + "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true" + ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ]; + }; + + networking.firewall.allowedTCPPorts = [ 9092 ]; + # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048) + virtualisation.memorySize = 2047; + }; + }; + + testScript = '' + startAll; + + $zookeeper1->waitForUnit("default.target"); + $zookeeper1->waitForUnit("zookeeper.service"); + $zookeeper1->waitForOpenPort(2181); + + $kafka->waitForUnit("default.target"); + $kafka->waitForUnit("apache-kafka.service"); + $kafka->waitForOpenPort(9092); + + $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); + $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); + '' + (if name == "kafka_0_9" then '' + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + '' else '' + $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); + ''); + }); + +in with pkgs; { + kafka_0_9 = makeKafkaTest "kafka_0_9" apacheKafka_0_9; + kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10; + kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11; + kafka_1_0 = makeKafkaTest "kafka_1_0" apacheKafka_1_0; + kafka_1_1 = makeKafkaTest "kafka_1_1" apacheKafka_1_1; +} diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix deleted file mode 100644 index 6e7820f64bc4b3d848c475ccd30c76013ec6fd68..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_0_10.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_0_10; -in { - name = "kafka_0_10"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix deleted file mode 100644 index 39f9c36bb22969f68d194f6cd294af8cdc72173c..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_0_11.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_0_11; -in { - name = "kafka_0_11"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix deleted file mode 100644 index fee82aba2bda317884f069291a2cd5a81ee195c2..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_0_9.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_0_9; -in { - name = "kafka_0_9"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix deleted file mode 100644 index 936840dbcfdc6a7dfb2eeabcddc344f94a62263c..0000000000000000000000000000000000000000 --- a/nixos/tests/kafka_1_0.nix +++ /dev/null @@ -1,48 +0,0 @@ -import ./make-test.nix ({ pkgs, lib, ... } : -let - kafkaPackage = pkgs.apacheKafka_1_0; -in { - name = "kafka_1_0"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - nodes = { - zookeeper1 = { config, ... }: { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; - kafka = { config, ... }: { - services.apache-kafka = { - enable = true; - extraProperties = '' - offsets.topic.replication.factor = 1 - ''; - package = kafkaPackage; - zookeeper = "zookeeper1:2181"; - }; - - networking.firewall.allowedTCPPorts = [ 9092 ]; - virtualisation.memorySize = 2048; - }; - }; - - testScript = '' - startAll; - - $zookeeper1->waitForUnit("zookeeper"); - $zookeeper1->waitForUnit("network.target"); - $zookeeper1->waitForOpenPort(2181); - - $kafka->waitForUnit("apache-kafka"); - $kafka->waitForUnit("network.target"); - $kafka->waitForOpenPort(9092); - - $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic"); - $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic"); - $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'"); - ''; -}) diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 34671df047c8ce228948842d9c89d6f03da8f65e..007d7ac216039da8312bcb0f36741d78224af876 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec { testScript = '' startAll; + $master->waitForUnit("zookeeper.service"); $master->waitForUnit("mesos-master.service"); + $slave->waitForUnit("docker.service"); $slave->waitForUnit("mesos-slave.service"); - + $master->waitForOpenPort(2181); $master->waitForOpenPort(5050); $slave->waitForOpenPort(5051); diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix index f5bcc460cba790a2325e4b93f8c83104ebf90894..ff3650988836d79a5c9c1adf13e9ad6b2079b601 100644 --- a/nixos/tests/mysql-backup.nix +++ b/nixos/tests/mysql-backup.nix @@ -23,17 +23,25 @@ import ./make-test.nix ({ pkgs, ... } : { testScript = '' startAll; + # Delete backup file that may be left over from a previous test run. + # This is not needed on Hydra but useful for repeated local test runs. + $master->execute("rm -f /var/backup/mysql/testdb.gz"); + # Need to have mysql started so that it can be populated with data. $master->waitForUnit("mysql.service"); - # Wait for testdb to be populated. - $master->sleep(10); + # Wait for testdb to be fully populated (5 rows). + $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); - # Do a backup and wait for it to finish. + # Do a backup and wait for it to start $master->startJob("mysql-backup.service"); $master->waitForJob("mysql-backup.service"); - # Check that data appears in backup + # wait for backup to fail, because of database 'doesnotexist' + $master->waitUntilFails("systemctl is-active -q mysql-backup.service"); + + # wait for backup file and check that data appears in backup + $master->waitForFile("/var/backup/mysql/testdb.gz"); $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello"); # Check that a failed backup is logged diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index 75c6d793febc35e82d60da033d5d3ecf63bcb028..ed09ac10b75d4f8c1b9ad48d8e484a51df256095 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -57,18 +57,25 @@ in $master->start; $master->waitForUnit("mysql"); $master->waitForOpenPort(3306); + # Wait for testdb to be fully populated (5 rows). + $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave1->start; $slave2->start; $slave1->waitForUnit("mysql"); $slave1->waitForOpenPort(3306); $slave2->waitForUnit("mysql"); $slave2->waitForOpenPort(3306); - $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + + # wait for replications to finish + $slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"); + $slave2->succeed("systemctl stop mysql"); $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N"); $slave2->succeed("systemctl start mysql"); $slave2->waitForUnit("mysql"); $slave2->waitForOpenPort(3306); - $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); + $slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"); ''; }) diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix index 1f19fc0867a49df04bd6c09b5f2b2f87ac48b504..be8862018777bc229cedf728d28e9bc3f95132a8 100644 --- a/nixos/tests/nexus.nix +++ b/nixos/tests/nexus.nix @@ -1,34 +1,32 @@ # verifies: # 1. nexus service starts on server -# 2. nexus user can be extended on server -# 3. nexus service not can startup on server (creating database and all other initial stuff) +# 2. nexus service can startup on server (creating database and all other initial stuff) +# 3. the web application is reachable via HTTP import ./make-test.nix ({ pkgs, ...} : { name = "nexus"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ironpinguin ]; + maintainers = [ ironpinguin ma27 ]; }; nodes = { server = { config, pkgs, ... }: - { virtualisation.memorySize = 2048; + { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit + virtualisation.diskSize = 2048; services.nexus.enable = true; - - users.extraUsers.nexus.extraGroups = [ "users" ]; }; + }; testScript = '' startAll; $server->waitForUnit("nexus"); - - print $server->execute("sudo -u nexus groups"); - $server->mustSucceed("sudo -u nexus groups | grep nexus | grep users"); - $server->waitForOpenPort(8081); + + $server->succeed("curl -f 127.0.0.1:8081"); ''; }) diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index ad4d4f8224353d1be28f49e7c6a7bd54ee14001a..c3c91e71b5ca85730486de918670ff52045472e6 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -41,6 +41,7 @@ in import ./make-test.nix ({ pkgs, ...} : { { address = "dead:beef::1"; prefixLength = 64; } ]; services.nsd.enable = true; + services.nsd.rootServer = true; services.nsd.interfaces = lib.mkForce []; services.nsd.zones."example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 @@ -55,6 +56,11 @@ in import ./make-test.nix ({ pkgs, ...} : { @ A 9.8.7.6 @ AAAA fedc::bbaa ''; + services.nsd.zones.".".data = '' + @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 + root A 1.8.7.4 + root AAAA acbd::4 + ''; }; }; @@ -86,6 +92,9 @@ in import ./make-test.nix ({ pkgs, ...} : { assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/); assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/); + + assertHost($_, "a", "root", qr/address 1.8.7.4$/); + assertHost($_, "aaaa", "root", qr/address acbd::4$/); }; } ''; diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix deleted file mode 100644 index 088aa79f8c6156eebfdb578cc69bc64d1f6aae3e..0000000000000000000000000000000000000000 --- a/nixos/tests/panamax.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "panamax"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - machine = { config, pkgs, ... }: { - services.panamax.enable = true; - }; - - testScript = - '' - startAll; - $machine->waitForUnit("panamax-api.service"); - $machine->waitForUnit("panamax-ui.service"); - $machine->waitForOpenPort(3000); - $machine->waitForOpenPort(8888); - $machine->succeed("curl --fail http://localhost:8888/ > /dev/null"); - $machine->shutdown; - ''; -}) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 557d65f7960a95c78e47bc3dc72e31a5fbcfcf51..9058c59c92deecb67c95e70a4bb4203ecfb8bd4c 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -15,11 +15,11 @@ import ./make-test.nix ({ pkgs, ... }: { testScript = '' $machine->waitForX; - $machine->execute("xterm -e 'gnome-calculator' &"); - $machine->waitForWindow(qr/Calculator/); - $machine->execute("xdotool key ctrl+shift+p"); - $machine->sleep(1); # wait for the popup - $machine->execute("xdotool key p r e f e r e n c e s Return"); + $machine->succeed("gnome-calculator &"); + $machine->waitForWindow(qr/gnome-calculator/); + $machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p"); + $machine->sleep(5); # wait for the popup + $machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return"); $machine->waitForWindow(qr/Preferences/); $machine->screenshot("screen"); ''; diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 8ac0639c6a8cebc96509cdee7b09c0466d9b980f..e3843038541593a17b36a92a3911bc32cadbc93d 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -43,7 +43,7 @@ in }); }) ]; - system.stateVersion = "17.03"; + system.nixos.stateVersion = "17.03"; }; radicale1_export = lib.recursiveUpdate radicale1 { services.radicale.extraArgs = [ @@ -54,7 +54,7 @@ in services.radicale.extraArgs = [ "--verify-storage" ]; }; radicale2 = lib.recursiveUpdate (common args) { - system.stateVersion = "17.09"; + system.nixos.stateVersion = "17.09"; }; }; diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix index a9d7dc61cb603ab876cbd58f2832ead5f199711b..666961249ced1734db645be166e6d7d57f141fb8 100644 --- a/nixos/tests/statsd.nix +++ b/nixos/tests/statsd.nix @@ -8,7 +8,7 @@ with lib; maintainers = [ ma27 ]; }; - nodes.statsd1 = { + machine = { services.statsd.enable = true; services.statsd.backends = [ "statsd-influxdb-backend" "console" ]; services.statsd.extraConfig = '' @@ -33,8 +33,19 @@ with lib; }; testScript = '' - $statsd1->start(); - $statsd1->waitForUnit("statsd.service"); - $statsd1->succeed("nc -z 127.0.0.1 8126"); + $machine->start(); + $machine->waitForUnit("statsd.service"); + $machine->waitForOpenPort(8126); + + # check state of the `statsd` server + $machine->succeed('[ "health: up" = "$(echo health | nc 127.0.0.1 8126 -w 120 -N)" ];'); + + # confirm basic examples for metrics derived from docs: + # https://github.com/etsy/statsd/blob/v0.8.0/README.md#usage and + # https://github.com/etsy/statsd/blob/v0.8.0/docs/admin_interface.md + $machine->succeed("echo 'foo:1|c' | nc -u -w 0 127.0.0.1 8125"); + $machine->succeed("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo"); + $machine->succeed("echo 'delcounters foo' | nc -w 120 127.0.0.1 8126 -N"); + $machine->fail("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo"); ''; }) diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix new file mode 100644 index 0000000000000000000000000000000000000000..d954b07f73d6fc9c4d76a6dce15b82249d32bec9 --- /dev/null +++ b/nixos/tests/xdg-desktop-portal.nix @@ -0,0 +1,17 @@ +# run installed tests +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "xdg-desktop-portal"; + meta = { + maintainers = pkgs.xdg-desktop-portal.meta.maintainers; + }; + + machine = { config, pkgs, ... }: { + environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; + }; + + testScript = '' + $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.xdg-desktop-portal.installedTests}/share'"); + ''; +}) diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix new file mode 100644 index 0000000000000000000000000000000000000000..045667bdcdec0fc48eb8e677d7d6f97ad98da0ed --- /dev/null +++ b/nixos/tests/xss-lock.nix @@ -0,0 +1,25 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "xss-lock"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + + machine = { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + programs.xss-lock.enable = true; + programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock"; + services.xserver.displayManager.auto.user = "alice"; + }; + + testScript = '' + $machine->start; + $machine->waitForX; + $machine->waitForUnit("xss-lock.service", "alice"); + + $machine->fail("pgrep xlock"); + $machine->succeed("su -l alice -c 'xset dpms force standby'"); + $machine->waitUntilSucceeds("pgrep xlock"); + ''; +}) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 35488732117d61f501c42378659ecd34f7417a2c..bd365e16730499420cd29aac83af6c293c347caa 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489"; + sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index c58178e3edbb11d69dcf5c237d13a3e6ad90b6d3..9915e0a301a1bea314531ac7316adf7554ba241b 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -86,4 +86,7 @@ rec { parity = callPackage ./parity { }; parity-beta = callPackage ./parity/beta.nix { }; + parity-ui = callPackage ./parity-ui { }; + + particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; }; } diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 8be24522f5648d3ffe6169cf38ecd30598566c26..cbba1ecba145d9a8e8e8f13226bb7ad01bf1d67a 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, git +{ stdenv, fetchFromGitHub, fetchpatch +, cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline , CoreData, IOKit, PCSC @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig git ]; + patches = [ + # fix daemon crash, remove with 0.12.1.0 update + (fetchpatch { + url = "https://github.com/monero-project/monero/commit/08343ab.diff"; + sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83"; + }) + ]; + buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch new file mode 100644 index 0000000000000000000000000000000000000000..5bbec1d39bea2d433c91db2c4c0e77fb7497f825 --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b43f02f6..4470abbf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC) + + include_directories (${CMAKE_SOURCE_DIR}) + +-set(Boost_USE_STATIC_LIBS ON) ++add_definitions(-DBOOST_LOG_DYN_LINK) + set(Boost_USE_MULTITHREADED ON) + + if (BOOST_CUSTOM) diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8c4722bd99171039aadf20c485b91bc8fdfe1b89 --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -0,0 +1,57 @@ +{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: + +stdenv.mkDerivation rec { + + name = "nano-wallet-${version}"; + version = "12.1"; + + src = fetchFromGitHub { + owner = "nanocurrency"; + repo = "raiblocks"; + rev = "V${version}"; + sha256 = "10ng7qn6y31s2bjahmpivw2plx90ljjjzb87j3l7zmppsjd2iq03"; + fetchSubmodules = true; + }; + + # Use a patch to force dynamic linking + patches = [ + ./CMakeLists.txt.patch + ]; + + cmakeFlags = let + options = { + BOOST_ROOT = "${boost}"; + Boost_USE_STATIC_LIBS = "OFF"; + RAIBLOCKS_GUI = "ON"; + RAIBLOCKS_TEST = "ON"; + Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; + Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core"; + Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui"; + Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets"; + }; + optionToFlag = name: value: "-D${name}=${value}"; + in lib.mapAttrsToList optionToFlag options; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost libGL qtbase ]; + + buildPhase = '' + make nano_wallet + ''; + + checkPhase = '' + ./core_test + ''; + + meta = { + inherit version; + description = "Wallet for Nano cryptocurrency"; + homepage = https://nano.org/en/wallet/; + license = lib.licenses.bsd2; + # Fails on Darwin. See: + # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962 + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..56a95b6d5968b687dce641f769d7f7822b53b70e --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -0,0 +1,50 @@ +{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }: + +let + +uiEnv = pkgs.callPackage ./env.nix { }; + +in stdenv.mkDerivation rec { + name = "parity-ui-${version}"; + version = "0.1.1"; + + src = fetchurl { + url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; + sha256 = "1jym6q63m5f4xm06dxiiabhbqnr0hysf2d3swysncs5hg6w00lh3"; + name = "${name}.deb"; + }; + + nativeBuildInputs = [ makeWrapper nodePackages.asar ]; + + buildCommand = '' + mkdir -p $out/usr/ + ar p $src data.tar.xz | tar -C $out -xJ . + substituteInPlace $out/usr/share/applications/parity-ui.desktop \ + --replace "/opt/Parity UI" $out/bin + mv $out/usr/* $out/ + mv "$out/opt/Parity UI" $out/share/parity-ui + rm -r $out/usr/ + rm -r $out/opt/ + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \ + $out/share/parity-ui/parity-ui + + find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \; + + paxmark m $out/share/parity-ui/parity-ui + + mkdir -p $out/bin + ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui + ''; + + meta = with stdenv.lib; { + description = "UI for Parity. Fast, light, robust Ethereum implementation"; + homepage = http://parity.io; + license = licenses.gpl3; + maintainers = [ maintainers.sorpaas ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix new file mode 100644 index 0000000000000000000000000000000000000000..a273bf33d1006d32e7b557231647016464536f7f --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: + +let + packages = [ + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify + xorg.libxcb libsecret gnome3.gconf + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + +in { inherit packages libPath; } diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix new file mode 100644 index 0000000000000000000000000000000000000000..f47b04c1daea2caf79efba8ddd9c9f03f3c95c4c --- /dev/null +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -0,0 +1,47 @@ +{ stdenv +, autoreconfHook +, boost +, db48 +, fetchurl +, libevent +, libtool +, miniupnpc +, openssl +, pkgconfig +, utillinux +, zeromq +, zlib +, withGui +, unixtools +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "particl-core-${version}"; + version = "0.16.0.5"; + + src = fetchurl { + url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; + sha256 = "070crn6nnzrbcaj30w0qbybpm9kfd2ghnvmxp29gckgknw6n0vam"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ + openssl db48 boost zlib miniupnpc libevent zeromq + unixtools.hexdump + ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = { + description = "Privacy-Focused Marketplace & Decentralized Application Platform"; + longDescription= '' + An open source, decentralized privacy platform built for global person to person eCommerce. + ''; + homepage = https://particl.io/; + maintainers = with maintainers; [ demyanrogozhin ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 1420627c02a085672e33368c679864ac163f8fcd..439175b090a8a8a44f4e41a41313c33d7be2cd47 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "cava-${version}"; - version = "0.6.0"; + version = "0.6.1"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr"; + sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 191074eba27aecb8d9b2d0389a28f9ac77cf8aba..c8ac0a938efa84f27a5d77883ec441bb00068754 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "csound-${version}"; - version = "6.10.0"; + version = "6.11.0"; enableParallelBuilding = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n"; + sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18"; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index f3a9b73aabe5e29152c74630bebd15c67c9f1c74..eb4dce814166fe505152420cb14e35b0f4d2944a 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.17.1"; + version = "3.18.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq"; + sha256 = "0j56pj7cqymdk22bjw33c9rz4n36k693gs3w6kg6y68as8l6qpvb"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index f56ca009f1e081fd8b3be386d10836034739b975..7ed9021e3e09b773e96c1d04486561e9c7c3cbdf 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,59 +1,37 @@ -{ stdenv, fetchzip, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools , qtwebkit, qtxmlpatterns }: stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.1.0"; + version = "2.2.1"; - src = fetchzip { - url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz"; - sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls"; + src = fetchFromGitHub { + owner = "musescore"; + repo = "MuseScore"; + rev = "v${version}"; + sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs"; }; - hardeningDisable = [ "relro" "bindnow" ]; - - makeFlags = [ - "PREFIX=$(out)" - ]; - cmakeFlags = [ - "-DAEOLUS=OFF" - "-DZERBERUS=ON" - "-DOSC=ON=ON" - "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error - "-DOCR=OFF" # Not necessary without OMR - "-DSOUNDFONT3=ON" - "-DHAS_AUDIOFILE=ON" - "-DBUILD_JACK=ON" - ]; - - preBuild = '' - make lrelease - ''; - - postBuild = '' - make manpages - ''; + ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - enableParallelBuilding = true; - buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis - portaudio qtbase qtdeclarative qtscript qtsvg qttools - qtwebkit qtxmlpatterns #tesseract + portaudio portmidi # tesseract + qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns ]; meta = with stdenv.lib; { description = "Music notation and composition software"; homepage = https://musescore.org/; license = licenses.gpl2; + maintainers = with maintainers; [ vandenoever ]; platforms = platforms.linux; - maintainers = [ maintainers.vandenoever ]; repositories.git = https://github.com/musescore/MuseScore; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index ada12eefaf7ebf1d94e649be75f88747e89da00d..8d49c49f0c6cd664ab89611beb54ba67854eaf62 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.38"; + version = "6.0.40"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc"; + sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x"; }; configurePhase = '' diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 660f342dc9d96f8ad9c91eb0641cfad2ce52edb0..cacc6e04429df6c19a452b01d81e95dcbd7c447c 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.2"; + name = "snd-18.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r"; + sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1a4f2bdd1b5b46d64dcab20e26be9904dc3a6f0d..5f6772256cab75eda70214e7aa47d7d8c584e6e4 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: let # Please update the stable branch! @@ -20,7 +20,6 @@ let ffmpeg_0_10 fontconfig freetype - GConf gdk_pixbuf glib gtk2 @@ -93,7 +92,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome2.zenity}/bin" + --prefix PATH : "${gnome3.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 4c4f958ec493712c971070b6b6429a659b7ab5ca..6bf45f451a5d7ad3b4edee51e3435278f3bcad2b 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20170428"; + version = "20180320"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; + sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 630f5dd34471d4365b5e58a79c3181fb6ec89652..ecc6e244a585cf6122555364837ee13310a354c8 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { - version = "3.2.0.12"; # "Android Studio 3.2 Canary 13" - build = "181.4749738"; - sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10"; + version = "3.2.0.14"; # "Android Studio 3.2 Canary 15" + build = "181.4773949"; + sha256Hash = "10lhy6sdvvh4a8kj8jyk4z9nzh67v8f5zpkwparvk3pb2s5mf3mk"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index ca223803f04deb7487521b1203b4cac486a4349f..225ec6a9456f1429cc022376b79e2f525e1ad175 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.26.1"; + version = "1.27.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11"; + sha256 = "1r37s6ndxyib644v7nlgha1pkcnz7kxpmlkhh41l5jp4dpc6iik6"; name = "${name}.deb"; }; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git + rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git + ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \; @@ -45,7 +47,7 @@ stdenv.mkDerivation rec { description = "A hackable text editor for the 21st Century"; homepage = https://atom.io/; license = licenses.mit; - maintainers = [ maintainers.offline maintainers.nequissimus ]; + maintainers = with maintainers; [ offline nequissimus synthetica ysndr ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 1688e606222dceaf29e5ac3842529e8381cea8f3..3a09b5c6be476007d176ba2f3e7ad70b3cc1a802 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -114,16 +114,16 @@ rec { }; eclipse-platform-47 = buildEclipse { - name = "eclipse-platform-4.7.2"; + name = "eclipse-platform-4.7.3a"; description = "Eclipse Platform Oxygen"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz; + sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz; - sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz; + sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c"; }; }; }; @@ -168,16 +168,16 @@ rec { }; eclipse-sdk-47 = buildEclipse { - name = "eclipse-sdk-4.7.2"; + name = "eclipse-sdk-4.7.3a"; description = "Eclipse Oxygen Classic"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz; - sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz; + sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz; - sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz; + sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a"; }; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 136ef7dfc23d52d80d740fc0a27b4e62191fa6d3..f381064c92cfd8dbc1aef3fe603082a10abbe2df 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -432,11 +432,11 @@ rec { jsonedit = buildEclipsePlugin rec { name = "jsonedit-${version}"; - version = "1.1.0"; + version = "1.1.1"; srcFeature = fetchurl { url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; - sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5"; + sha256 = "0zkg8d8x3l5jpfxi0mz9dn62wmy4fjgpwdikj280fvsklmcw5b86"; }; srcPlugins = @@ -448,13 +448,13 @@ rec { }; in map fetch [ - { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; } - { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; } - { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; } - { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; } - { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; } - { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; } - { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; } + { n = "core"; h = "0svs0aswnhl26cqw6bmw30cisx4cr50kc5njg272sy5c1dqjm1zq"; } + { n = "editor"; h = "1q62dinrbb18aywbvii4mlr7rxa20rdsxxd6grix9y8h9776q4l5"; } + { n = "folding"; h = "1qh4ijfb1gl9xza5ydi87v1kyima3a9sh7lncwdy1way3pdhln1y"; } + { n = "model"; h = "1pr6k2pdfdwx8jqs7gx7wzn3gxsql3sk6lnjha8m15lv4al6d4kj"; } + { n = "outline"; h = "1jgr2g16j3id8v367jbgd6kx6g2w636fbzmd8jvkvkh7y1jgjqxm"; } + { n = "preferences"; h = "027fhaqa5xbil6dmhvkbpha3pgw6dpmc2im3nlliyds57mdmdb1h"; } + { n = "text"; h = "0clywylyidrxlqs0n816nhgjmk1c3xl7sn904ki4q050amfy0wb2"; } ]; propagatedBuildInputs = [ antlr-runtime_4_7 ]; @@ -470,12 +470,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7.2"; + version = "4.7.3a"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip; - sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip; + sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f37d2289342ae4fc4690c665c47c67b480e95257 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }: + +let + emacsSources = stdenv.mkDerivation { + name = emacs.name + "-sources"; + src = emacs.src; + + configurePhase = ":"; + dontBuild = true; + doCheck = false; + fixupPhase = ":"; + + installPhase = '' + mkdir -p $out + cp -a * $out + ''; + + }; + +in stdenv.mkDerivation rec { + name = "emacs-libvterm-${version}"; + version = "unstable-2017-11-24"; + + src = fetchFromGitHub { + owner = "akermu"; + repo = "emacs-libvterm"; + rev = "829ae86f60c3a54048804997edffa161c77a2f4b"; + sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ emacs libvterm-neovim ]; + + cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ]; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install ../*.el $out/share/emacs/site-lisp + install ../*.so $out/share/emacs/site-lisp + ''; +} diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 98172ce1905bc2017d6c09850f79cf8c07c91c5e..2de973d41f66033d2baaa07f6b397f71814464a7 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -276,12 +276,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */ + sha256 = "0ws5s8bvjpz60pdyak3vb22x27qi00ajxx18wia1hql8831gsk3m"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -289,12 +289,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */ + sha256 = "14h71x3jidwiwv73g48f6bd0y4p3s33jb4wdr5grdhm677pqb702"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -354,12 +354,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.1.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */ + sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2018.1"; @@ -367,12 +367,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.1.2"; /* updated by script */ + version = "2018.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */ + sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 9ff1c44dceb074f9eb861db7a552f396bfb1451f..c29cbe52872e678ce2efb10c606896b04a556f75 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.4"; + version = "2.9.7"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c"; + sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 149f7804a79911b7dfc5c8582fa9f5ba50dd2a90..b090b0c84f962fe7015085cc7581ae4d6995d52c 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luaPackages, ncurses, perl, pkgconfig , unibilium, vimUtils, xsel, gperf, callPackage +, libvterm-neovim , withJemalloc ? true, jemalloc }: @@ -8,35 +9,6 @@ with stdenv.lib; let - # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = stdenv.mkDerivation rec { - name = "neovim-libvterm-${version}"; - version = "2017-11-05"; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "libvterm"; - rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8"; - sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6"; - }; - - buildInputs = [ perl ]; - nativeBuildInputs = [ libtool ]; - - makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - - enableParallelBuilding = true; - - meta = { - description = "VT220/xterm/ECMA-48 terminal emulator library"; - homepage = http://www.leonerd.org.uk/code/libvterm/; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - platforms = platforms.unix; - }; - }; - neovim = stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; version = "0.2.2"; @@ -55,7 +27,7 @@ let libuv libmsgpack ncurses - neovimLibvterm + libvterm-neovim unibilium luaPackages.lua gperf @@ -75,6 +47,7 @@ let cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" + "-DGPERF_PRG=${gperf}/bin/gperf" ]; # triggers on buffer overflow bug while running tests diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 87b011c4f8b40c184bff1c50073cac592a2cc725..a95ced76371d40c7095e0ee2e79a9d8f2a18830d 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.2) + msgpack (1.2.4) multi_json (1.13.1) - neovim (0.6.2) + neovim (0.7.0) msgpack (~> 1.0) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index aefecbf5ba83adc0be7f80e9d3003063bf86fd09..af887161ea6cff33273614d2b81a079f32b6e704 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1"; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.4"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53"; + sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; type = "gem"; }; - version = "0.6.2"; + version = "0.7.0"; }; } diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 01445ade4732165327526de62a7b5810492100c9..8ab7c81440791c4086a43003c1ec643751cd5bb3 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,14 +5,14 @@ let in rec { sublime3-dev = common { - buildVersion = "3162"; - x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i"; - x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3"; + buildVersion = "3176"; + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; } {}; sublime3 = common { - buildVersion = "3143"; - x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + buildVersion = "3176"; + x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23"; + x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl"; } {}; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index d687712fc08a0c759d0168e00eae01726e780275..ed4aefd90bc5adb2db690d554166fcbbe69b91cf 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, atk, cairo +{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gtk3, atk, cairo , freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }: stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.47"; + version = "0.9.48"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9"; + sha256 = "36a7c5f855306bcbe3364d12aca94c2f6d013a013e59b46f89df81496ec11800"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6"; + sha256 = "7197c526918a791b15b701846f9f2f1747a5b8ceac77c4cba691ee6d74d07d1d"; } ; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { gnome2.gdk_pixbuf gnome2.pango expat + gtk3 atk nspr nss diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 5b4f631987f2519678119f634e6d3ea610361c8d..a93054a9aeb8ef0a4f042176a94d676554c69ec3 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.0.1655"; + version = "8.1.0001"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1"; + sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5c10f6fb3bbca059ddf961673de3c9605fa85dcb..29de230d38c79072fa5ed8d1c7c156aa00f10fc4 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.22.2"; + version = "1.23.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n"; - "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam"; - "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj"; + "i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6"; + "x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk"; + "x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 65a3238ef57135924d0b34c801af78727c845060..1a9bb44cabb69c22ad200430c3c900349e4fe208 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.7-29"; - sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6"; + version = "7.0.7-32"; + sha256 = "1i3rvq0f4lq1las4g12ipfs6h5vyngwh5fllvynpci2lh32gd48j"; patches = []; }; in diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c1e2da20e5486469e8c5d06b6d9eff90eb759dba --- /dev/null +++ b/pkgs/applications/graphics/avocode/default.nix @@ -0,0 +1,99 @@ +{ stdenv, lib, makeDesktopItem, fetchurl, unzip +, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 +, xorg, mozjpeg +}: + +stdenv.mkDerivation rec { + name = "avocode-${version}"; + version = "2.26.1"; + + src = fetchurl { + url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; + sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8"; + }; + + libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ + stdenv.cc.cc.lib + gdk_pixbuf + glib + gtk2 + atk + pango + cairo + freetype + fontconfig + dbus + nss + nspr + alsaLib + cups + expat + udev + GConf + libX11 + libxcb + libXi + libXcursor + libXdamage + libXrandr + libXcomposite + libXext + libXfixes + libXrender + libXtst + libXScrnSaver + ]); + + desktopItem = makeDesktopItem { + name = "Avocode"; + exec = "avocode"; + icon = "avocode"; + desktopName = "Avocode"; + genericName = "Design Inspector"; + categories = "Application;Development;"; + comment = "The bridge between designers and developers"; + }; + + buildInputs = [ unzip ]; + + # src is producing multiple folder on unzip so we must + # override unpackCmd to extract it into newly created folder + unpackCmd = '' + mkdir out + unzip $curSrc -d out + ''; + + installPhase = '' + substituteInPlace avocode.desktop.in \ + --replace /path/to/avocode-dir/Avocode $out/bin/avocode \ + --replace /path/to/avocode-dir/avocode.png avocode + + mkdir -p share/applications share/pixmaps + mv avocode.desktop.in share/applications/avocode.desktop + mv avocode.png share/pixmaps/ + + rm resources/cjpeg + cp -av . $out + + mkdir $out/bin + ln -s $out/avocode $out/bin/avocode + ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg + ''; + + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-rpath ${libPath}:$out/ $file + done + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://avocode.com/; + description = "The bridge between designers and developers"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ megheaiulian ]; + }; +} diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index b604099096ff10d3d944d570ed2851d0c0ddd72c..d817424c45258223795c433da10c265a0888c006 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,10 +1,10 @@ -{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, +{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, - xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, + xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: -let version = "2017-SP2"; in +let version = "2018SP2"; in stdenv.mkDerivation { name = "draftsight-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { $out/bin/$exe \ --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" done - for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do + for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so*; do # DraftSight ships with broken symlinks for some reason if [ -f $(readlink -f $lib) ] then @@ -41,6 +41,19 @@ stdenv.mkDerivation { echo "Ignoring broken link $lib" fi done + for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do + if [ -f $(readlink $lib) ] + then + echo "Patching $lib..." + chmod u+w $lib + patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib + else + echo "Ignoring broken link $lib" + fi + done + # These libraries shouldn't really be here anyway: + find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \ + -type d -name _lib | xargs rm -r ''; # TODO: Figure out why HelpGuide segfaults at startup. @@ -51,15 +64,15 @@ stdenv.mkDerivation { # that it dlopen()'s libraries in paths removed by shrinking RPATH. dontPatchELF = true; - src = requireFile { + src = fetchurl { name = "draftSight.deb"; - url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0"; - sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; + url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb"; + sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx"; }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 - xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 + xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcomposite ]; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02528a43e31b6216ff9e7037978c80e4ad4c805d --- /dev/null +++ b/pkgs/applications/graphics/epeg/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +, libjpeg, libexif +}: + +stdenv.mkDerivation rec { + name = "epeg-0.9.1.042"; # version taken from configure.ac + + src = fetchFromGitHub { + owner = "mattes"; + repo = "epeg"; + rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b"; + sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + + propagatedBuildInputs = [ libjpeg libexif ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mattes/epeg; + description = "Insanely fast JPEG/ JPG thumbnail scaling"; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 475c8de97b9128c573c96f947ce1821c76d13024..eb7daf2797bf02020e2f87586f08c9ae3722033d 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26"; + version = "2.26.3"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi"; + sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2536367f6cebb7a730308436277afb79785d1951..f92594f08e167eacde3133e42988cb0812a1a225 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 @@ -9,45 +9,22 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.10.0"; + version = "2.10.2"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; - sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"; + sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w"; }; - patches = [ - # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620 - (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371482; - sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc"; - }) - - # fix absolute paths stored in configuration - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6; - sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris"; - }) - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df; - sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh"; - }) - - # fix pc file (needed e.g. for building plug-ins) - (fetchpatch { - url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe; - sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc buildInputs = [ - babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] + ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; pythonPath = [ pygtk ]; @@ -79,6 +56,8 @@ in stdenv.mkDerivation rec { configureFlags = [ "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/var/run/current-system/sw/share/color/icc" ]; doCheck = true; diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix new file mode 100644 index 0000000000000000000000000000000000000000..bd1ce2ed893a49655c26e2e0fdc4f40a7476add2 --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/compat.nix @@ -0,0 +1,37 @@ +{ stdenv, graphicsmagick }: + +stdenv.mkDerivation rec { + name = "graphicsmagick-imagemagick-compat-${version}"; + inherit (graphicsmagick) version; + + unpackPhase = "true"; + buildPhase = "true"; + + utils = [ + "composite" + "conjure" + "convert" + "identify" + "mogrify" + "montage" + "animate" + "display" + "import" + ]; + + # TODO: symlink libraries? + installPhase = '' + mkdir -p "$out"/bin + mkdir -p "$out"/share/man/man1 + for util in ''${utils[@]}; do + ln -s ${graphicsmagick}/bin/gm "$out/bin/$util" + ln -s ${graphicsmagick}/share/man/man1/gm.1.gz "$out/share/man/man1/$util.1.gz" + done + ''; + + meta = { + description = "ImageMagick interface for GraphicsMagick"; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f086a8f5ba608b51b8caaedd49a5eeabc073b4c1..872afb39ec6ff6c0ced4c3e2aa8b20d7bde332a5 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,13 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.28"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; + version = "1.3.29"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; + sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1"; }; patches = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 5978612fdf3361c0692ed556d2a24f55c059ffb7..de4849e21620869fc6977ebeb0a8d3e6b3af9471 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation rec { libvisio libcdr libexif potrace python2Env icu ]; - enableParallelBuilding = true; + # To avoid non-deterministic build failure using make. + # When switching back to cmake turn parallel back on, see #40046. + enableParallelBuilding = false; preConfigure = '' intltoolize -f diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 5af0e627d7d855d72c2171444926e5bb90d31aa2..690253947a18e4499f27b14a8cfc08432d290058 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -9,11 +9,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc"; + sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 33fddf6c8d0121ff06509f727e9d5b9843a32beb..9ab5288700cce31ba73ac8b9b2fc2a86ea161492 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext +{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal +, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: stdenv.mkDerivation rec { - version = "2015.03-3"; + version = "2018.04-git"; name = "openscad-${version}"; - src = fetchurl { - url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# src = fetchurl { +# url = "http://files.openscad.org/${name}.src.tar.gz"; +# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# }; + src = fetchFromGitHub { + owner = "openscad"; + repo = "openscad"; + rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; + sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib - pkgconfig harfbuzz qscintilla gettext - ]; + bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib + pkgconfig harfbuzz gettext + ] + ++ (with qt5; [qtbase qmake]) + ++ (with libsForQt5; [qscintilla]) + ; qmakeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 757ce52e9c4c8e296970b2a0de67d6564a3270d4..e4f565b3b052b6eb6603fc8277eb53bc25d60904 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; + sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 2cc127a3fc6fa97c5d9bce3365542ebc49fbd847..3bc814e1e758d88428b06f93d9921d7f54380cae 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +, hicolor-icon-theme +}: let perlModules = with perlPackages; @@ -29,6 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/shutter \ --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \ --prefix PATH : "${imagemagick.out}/bin" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix new file mode 100644 index 0000000000000000000000000000000000000000..cc1acbc6dd05e1f9828e5ecb677afa88f368a11a --- /dev/null +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio, + kmailtransport, kwallet, mailcommon, mailimporter, messagelib +}: + +mkDerivation { + name = "akonadi-import-wizard"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi karchive kcontacts kcrash kidentitymanagement kio + kmailtransport kwallet mailcommon mailimporter messagelib + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5870179b6c0b961fc396e9daa320090134dd7698..8f64c88493116b53e2701886f3d66dd35a62f09a 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -67,6 +67,7 @@ let akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; @@ -101,6 +102,7 @@ let kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; @@ -125,6 +127,7 @@ let konsole = callPackage ./konsole.nix {}; kontact = callPackage ./kontact.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; + konquest = callPackage ./konquest.nix {}; korganizer = callPackage ./korganizer.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; @@ -138,6 +141,7 @@ let libgravatar = callPackage ./libgravatar.nix {}; libkcddb = callPackage ./libkcddb.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; + libkdegames = callPackage ./libkdegames.nix {}; libkdepim = callPackage ./libkdepim.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; libkgapi = callPackage ./libkgapi.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index a2feeac7cd9f95bb6f442169d6c9b9f65ea57a02..0646e258b40e73b6febe94037f6844063f03376b 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.04.1/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch deleted file mode 100644 index ea2af2b09509f6b591eb6f571f29320b7c9c8203..0000000000000000000000000000000000000000 --- a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt ---- kdenlive-17.04.1-upstream/CMakeLists.txt 2017-06-10 00:06:44.773146595 -0400 -+++ kdenlive-17.04.1/CMakeLists.txt 2017-06-10 00:07:35.766596566 -0400 -@@ -79,7 +79,7 @@ - check_include_files(malloc.h HAVE_MALLOC_H) - check_include_files(pthread.h HAVE_PTHREAD_H) - --find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick ) -+find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick ) - find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET) - - find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b5eca47d6c0eb5791786b3d9b7a486898633d6cd..65080ba7f066b201390d149dff9d0211af61dde1 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -34,9 +34,6 @@ mkDerivation { name = "kdenlive"; - patches = [ - ./kdenlive-cmake-concurrent-module.patch - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix new file mode 100644 index 0000000000000000000000000000000000000000..fd3fe2d6c098da39f2d373877646dcfc2b7f6355 --- /dev/null +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, shared-mime-info, + akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, + incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, + kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, + libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison +}: + +mkDerivation { + name = "kdepim-addons"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ + akonadi-import-wizard akonadi-notes calendarsupport eventviews + incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative + kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar + libksieve mailcommon mailimporter messagelib poppler_qt5 prison + ]; +} diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix new file mode 100644 index 0000000000000000000000000000000000000000..cfef018de6cc05faf4063740a8c6411d039999d1 --- /dev/null +++ b/pkgs/applications/kde/konquest.nix @@ -0,0 +1,18 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kdelibs4support +, libkdegames +, qtquickcontrols +}: + +mkDerivation { + name = "konquest"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kdelibs4support libkdegames qtquickcontrols ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix new file mode 100644 index 0000000000000000000000000000000000000000..494b193b8326e7c172c5aa20d4223d3436b472f1 --- /dev/null +++ b/pkgs/applications/kde/libkdegames.nix @@ -0,0 +1,26 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kdelibs4support +, qtdeclarative +, kdeclarative +, kdnssd +, knewstuff +, openal +, libsndfile +, qtquickcontrols +}: + +mkDerivation { + name = "libkdegames"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile + qtquickcontrols + ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ lheckemann ]; + }; +} diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 36c18a3f99792369033e9eb538e18780fc430008..5514345057d69f6fa8839414ef56bd6bda6aa861 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1699 +3,1699 @@ { akonadi = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz"; - sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d"; - name = "akonadi-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-18.04.1.tar.xz"; + sha256 = "0dg0r49angzkp5b09zbxjygjaxn1d50db15rwm7v9xsnz6fmc6hv"; + name = "akonadi-18.04.1.tar.xz"; }; }; akonadi-calendar = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz"; - sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna"; - name = "akonadi-calendar-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-18.04.1.tar.xz"; + sha256 = "0anmy67dc85afc0aq6y813c6xjr0jnkzsh56889zyz8z7k9xpg2q"; + name = "akonadi-calendar-18.04.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz"; - sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f"; - name = "akonadi-calendar-tools-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz"; + sha256 = "1935d5nwq2s8ijc9nzp7rdsmbyl2b42xwx0vj7cz1835y4w3k2vn"; + name = "akonadi-calendar-tools-18.04.1.tar.xz"; }; }; akonadiconsole = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz"; - sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz"; - name = "akonadiconsole-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadiconsole-18.04.1.tar.xz"; + sha256 = "032r5r5ksifigx8bk82yygvhji1xjx3dd6i7z7mpx5qlc1zmqjpk"; + name = "akonadiconsole-18.04.1.tar.xz"; }; }; akonadi-contacts = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz"; - sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2"; - name = "akonadi-contacts-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-contacts-18.04.1.tar.xz"; + sha256 = "1y1qcndsrdphii048cpwnfnd185mywcaw1h1szq71q2ww2aapcmp"; + name = "akonadi-contacts-18.04.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz"; - sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19"; - name = "akonadi-import-wizard-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-import-wizard-18.04.1.tar.xz"; + sha256 = "150i8m7ngb6kdyixvzfgnjwyrs2xpsd53gy2x28091kg2kqb0nl4"; + name = "akonadi-import-wizard-18.04.1.tar.xz"; }; }; akonadi-mime = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz"; - sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw"; - name = "akonadi-mime-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-mime-18.04.1.tar.xz"; + sha256 = "0ypfbrr8h2nypdyg8xxs4d53qlbq4kd3ph2yhafp80577xwhqgmw"; + name = "akonadi-mime-18.04.1.tar.xz"; }; }; akonadi-notes = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz"; - sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v"; - name = "akonadi-notes-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-notes-18.04.1.tar.xz"; + sha256 = "0f4q6ls7z5ikf46v7m0wazdczay8y3yvscw1lnmq5qwnvdfyqcpd"; + name = "akonadi-notes-18.04.1.tar.xz"; }; }; akonadi-search = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz"; - sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0"; - name = "akonadi-search-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akonadi-search-18.04.1.tar.xz"; + sha256 = "01mfj7s3kx5kcjbvj4hljfrmsbpfmfiq0r87cgzg6734c4mzjqsl"; + name = "akonadi-search-18.04.1.tar.xz"; }; }; akregator = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz"; - sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc"; - name = "akregator-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/akregator-18.04.1.tar.xz"; + sha256 = "0h5pdbrwxa3n086yywqsm0m8x9p1s5jy2hgjivdilxgwnqcj6zpv"; + name = "akregator-18.04.1.tar.xz"; }; }; analitza = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz"; - sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2"; - name = "analitza-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/analitza-18.04.1.tar.xz"; + sha256 = "09y3zz6zn3cs5nn0i0dcx71jrm0lzz3g8af6nz118m6rz71wndnq"; + name = "analitza-18.04.1.tar.xz"; }; }; ark = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz"; - sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12"; - name = "ark-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ark-18.04.1.tar.xz"; + sha256 = "10gpm90zsssygl65280z4p43ma75qjswiyv4drlrksydakxvvxk3"; + name = "ark-18.04.1.tar.xz"; }; }; artikulate = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz"; - sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg"; - name = "artikulate-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/artikulate-18.04.1.tar.xz"; + sha256 = "0brpb7ijqib7qp5ypvz9gkai7mwdxf915a7makklgzg80mdqnxpv"; + name = "artikulate-18.04.1.tar.xz"; }; }; audiocd-kio = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz"; - sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1"; - name = "audiocd-kio-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/audiocd-kio-18.04.1.tar.xz"; + sha256 = "1g3waj7xb14fgb75b0zzhbai93yqv5r1p0n0j3rwhfg9bvkgqgpa"; + name = "audiocd-kio-18.04.1.tar.xz"; }; }; baloo-widgets = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz"; - sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj"; - name = "baloo-widgets-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/baloo-widgets-18.04.1.tar.xz"; + sha256 = "1bq2n7lpldi2qiwdgx6l78m41whdjd41n1247985d1cr62bsn5cq"; + name = "baloo-widgets-18.04.1.tar.xz"; }; }; blinken = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz"; - sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9"; - name = "blinken-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/blinken-18.04.1.tar.xz"; + sha256 = "0sgaipxfzwjfikyj2r47vp0192s8v0zll2x61i9z6p6lzq7glw0j"; + name = "blinken-18.04.1.tar.xz"; }; }; bomber = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz"; - sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn"; - name = "bomber-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/bomber-18.04.1.tar.xz"; + sha256 = "13ivb42jq2864vdpajds3cwjhhml7ikww66z1r6j4wp8mlmdlnal"; + name = "bomber-18.04.1.tar.xz"; }; }; bovo = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz"; - sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500"; - name = "bovo-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/bovo-18.04.1.tar.xz"; + sha256 = "1lm465vcmf4glql9krxl36sr6msgayqkzinammw9ian1wmih9qbn"; + name = "bovo-18.04.1.tar.xz"; }; }; calendarsupport = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz"; - sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r"; - name = "calendarsupport-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/calendarsupport-18.04.1.tar.xz"; + sha256 = "02zw1hyqwy031bg0nyxjvayjfamm0z9iw9v9f71hfrsi9siyf77a"; + name = "calendarsupport-18.04.1.tar.xz"; }; }; cantor = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz"; - sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151"; - name = "cantor-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/cantor-18.04.1.tar.xz"; + sha256 = "1hcdf755yzs8kz6qbxan47gn622pg137sqabfbvqjflnphzz7f08"; + name = "cantor-18.04.1.tar.xz"; }; }; cervisia = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz"; - sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq"; - name = "cervisia-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/cervisia-18.04.1.tar.xz"; + sha256 = "03slkk30k747f73dk98q4b930m7w1cimim053hl9y50n1c63n021"; + name = "cervisia-18.04.1.tar.xz"; }; }; dolphin = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz"; - sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm"; - name = "dolphin-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz"; + sha256 = "11wm2wqmkni798xj6g8z7r6qyfy6db9k7xwnp90k2g1qb5n0xnsh"; + name = "dolphin-18.04.1.tar.xz"; }; }; dolphin-plugins = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz"; - sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq"; - name = "dolphin-plugins-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/dolphin-plugins-18.04.1.tar.xz"; + sha256 = "00azpyy8xh0d62vayj04l3cbwxgxax430wh35jbv828vng3d2pfc"; + name = "dolphin-plugins-18.04.1.tar.xz"; }; }; dragon = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz"; - sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w"; - name = "dragon-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/dragon-18.04.1.tar.xz"; + sha256 = "1phrgssp3x11dmg07yvyi1hsmigfw8q6bblsizr9xm0pvmgrdjl0"; + name = "dragon-18.04.1.tar.xz"; }; }; eventviews = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz"; - sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3"; - name = "eventviews-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/eventviews-18.04.1.tar.xz"; + sha256 = "0jq1adi764a4w1kszhbdm49dylbwai4ipasjyrkqnf85xly48g40"; + name = "eventviews-18.04.1.tar.xz"; }; }; ffmpegthumbs = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz"; - sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6"; - name = "ffmpegthumbs-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ffmpegthumbs-18.04.1.tar.xz"; + sha256 = "06ls31wxgvnc4c7bc3ba14w4w64b9x37q3zmcnslyydghhnr0qnn"; + name = "ffmpegthumbs-18.04.1.tar.xz"; }; }; filelight = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz"; - sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43"; - name = "filelight-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/filelight-18.04.1.tar.xz"; + sha256 = "1w169433m5823h1axn4ami9hk4rimi87ypiqagyyl13bncb7s6as"; + name = "filelight-18.04.1.tar.xz"; }; }; granatier = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz"; - sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33"; - name = "granatier-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/granatier-18.04.1.tar.xz"; + sha256 = "0q5a2w2bz40qnk7jpcknsc4758k91cd1rh3rxa4v4wlq51id7lzz"; + name = "granatier-18.04.1.tar.xz"; }; }; grantlee-editor = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz"; - sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h"; - name = "grantlee-editor-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/grantlee-editor-18.04.1.tar.xz"; + sha256 = "0ysirk51y993jxvvk98h2r9awsc4zyijavfja6zl0gsnvwwrjnjs"; + name = "grantlee-editor-18.04.1.tar.xz"; }; }; grantleetheme = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz"; - sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03"; - name = "grantleetheme-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/grantleetheme-18.04.1.tar.xz"; + sha256 = "0gzsxxywaqs6lc111hsw736p6gz55xs77v9bpk48igk37r9a0rs8"; + name = "grantleetheme-18.04.1.tar.xz"; }; }; gwenview = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz"; - sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5"; - name = "gwenview-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/gwenview-18.04.1.tar.xz"; + sha256 = "0wyxwqsf2nynz4h87lgy1xla8nj7mi94b997pmp70jzy4936l8bi"; + name = "gwenview-18.04.1.tar.xz"; }; }; incidenceeditor = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz"; - sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4"; - name = "incidenceeditor-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/incidenceeditor-18.04.1.tar.xz"; + sha256 = "0kc18pml59mhn9bn0g96mw46dmxq7crgn4033dxsfczak0kdr474"; + name = "incidenceeditor-18.04.1.tar.xz"; }; }; juk = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz"; - sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa"; - name = "juk-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/juk-18.04.1.tar.xz"; + sha256 = "01zgxxx00hxag29883xfgw4r0m4j66iwr83bap55ni018xgkf4c3"; + name = "juk-18.04.1.tar.xz"; }; }; k3b = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz"; - sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l"; - name = "k3b-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/k3b-18.04.1.tar.xz"; + sha256 = "0py84q63r40mh8pp0r70gzwidfxv9kj5firvr7pp59rk9fsxznl7"; + name = "k3b-18.04.1.tar.xz"; }; }; kaccounts-integration = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz"; - sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09"; - name = "kaccounts-integration-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kaccounts-integration-18.04.1.tar.xz"; + sha256 = "1abyhaa7gj2admk6kf555sbwzc7yha3ql41dhw4j3k6kpzkqk9zj"; + name = "kaccounts-integration-18.04.1.tar.xz"; }; }; kaccounts-providers = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz"; - sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia"; - name = "kaccounts-providers-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kaccounts-providers-18.04.1.tar.xz"; + sha256 = "15ygghq434qkj1z5iislm8fz0m8z6rkpiyrcjbmqs0cw4s0mqzp6"; + name = "kaccounts-providers-18.04.1.tar.xz"; }; }; kaddressbook = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz"; - sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir"; - name = "kaddressbook-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kaddressbook-18.04.1.tar.xz"; + sha256 = "0w02gc9l8jhzf15ljig83ddbkzf430k1qbqp821b3rz5s20gg4m5"; + name = "kaddressbook-18.04.1.tar.xz"; }; }; kajongg = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz"; - sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5"; - name = "kajongg-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kajongg-18.04.1.tar.xz"; + sha256 = "1vpkj42ylzpakrqy84hkp0hvj4q4x7wnarwwqqj8xp4xi40na481"; + name = "kajongg-18.04.1.tar.xz"; }; }; kalarm = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz"; - sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02"; - name = "kalarm-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kalarm-18.04.1.tar.xz"; + sha256 = "0v6maszs79959jkciy5j9xnqggr9ymjzvsibr1j5s30kynlzpxkm"; + name = "kalarm-18.04.1.tar.xz"; }; }; kalarmcal = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz"; - sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7"; - name = "kalarmcal-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kalarmcal-18.04.1.tar.xz"; + sha256 = "1j04wdb6vg2896hb8y28lm8sna0lil8021i2kw97crfhramldvjk"; + name = "kalarmcal-18.04.1.tar.xz"; }; }; kalgebra = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz"; - sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6"; - name = "kalgebra-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kalgebra-18.04.1.tar.xz"; + sha256 = "0gg1fb4cgnnrxyrm554847kpa1bs57zgi9ia8f9wmcivyd35vvyf"; + name = "kalgebra-18.04.1.tar.xz"; }; }; kalzium = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz"; - sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv"; - name = "kalzium-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kalzium-18.04.1.tar.xz"; + sha256 = "00x2jql639rmbvcfj72yjmfb98f9msfwi2g2mqyww43ja3c835ic"; + name = "kalzium-18.04.1.tar.xz"; }; }; kamera = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz"; - sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc"; - name = "kamera-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kamera-18.04.1.tar.xz"; + sha256 = "1ra7hdvs6fnkbzqvm5sryk6ymlgj0ngsg98yhznda0qvrrkgfahg"; + name = "kamera-18.04.1.tar.xz"; }; }; kamoso = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz"; - sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk"; - name = "kamoso-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kamoso-18.04.1.tar.xz"; + sha256 = "1rd08647zx2k7xq8jclxsk0dgjgdaih6fxmnrd7awzjmj0qh89a7"; + name = "kamoso-18.04.1.tar.xz"; }; }; kanagram = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz"; - sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc"; - name = "kanagram-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kanagram-18.04.1.tar.xz"; + sha256 = "0g4zmr10jq9vw92z9nbfvigz6pbjg1p1zc1aspwlh38ajk8sr3gb"; + name = "kanagram-18.04.1.tar.xz"; }; }; kapman = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz"; - sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m"; - name = "kapman-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kapman-18.04.1.tar.xz"; + sha256 = "14s2kg50r9nlg53vsi1x59kc8z1rgnqcq028a6zwfnv0sdsa7pw5"; + name = "kapman-18.04.1.tar.xz"; }; }; kapptemplate = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz"; - sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp"; - name = "kapptemplate-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kapptemplate-18.04.1.tar.xz"; + sha256 = "064pw1fkbm52pkcg9hyay8mkraw3fdlycgx306p9brahvxb9xjsb"; + name = "kapptemplate-18.04.1.tar.xz"; }; }; kate = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz"; - sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5"; - name = "kate-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kate-18.04.1.tar.xz"; + sha256 = "1xbckjsp5imxcda8vrdb5flgb5sjmdylwy1yr5v01nilmqgpmwa8"; + name = "kate-18.04.1.tar.xz"; }; }; katomic = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz"; - sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q"; - name = "katomic-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/katomic-18.04.1.tar.xz"; + sha256 = "0g3kkibgnxkg5zxgja7rqad57fpw28qapf8rlbczkmxls581ifw6"; + name = "katomic-18.04.1.tar.xz"; }; }; kbackup = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz"; - sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q"; - name = "kbackup-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kbackup-18.04.1.tar.xz"; + sha256 = "1gv5m4d6zcadamcicllfp8smm7k4846a2qy4pgm006lhk390bsyz"; + name = "kbackup-18.04.1.tar.xz"; }; }; kblackbox = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz"; - sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx"; - name = "kblackbox-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kblackbox-18.04.1.tar.xz"; + sha256 = "0hv6ziw2dy88fbc1z0vlflagsrr7x97r9c5l4w9v4acr0ih7ms7h"; + name = "kblackbox-18.04.1.tar.xz"; }; }; kblocks = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz"; - sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar"; - name = "kblocks-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kblocks-18.04.1.tar.xz"; + sha256 = "12339f1g73h3qg9a21kqmkqp6ywiw1gvnwdww45dzflf4w931lsw"; + name = "kblocks-18.04.1.tar.xz"; }; }; kblog = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz"; - sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs"; - name = "kblog-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kblog-18.04.1.tar.xz"; + sha256 = "1gndfvny1zh2w1daxmpix5sn2wlbc2430m3a21lvgp3qmhb5rwkr"; + name = "kblog-18.04.1.tar.xz"; }; }; kbounce = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz"; - sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21"; - name = "kbounce-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kbounce-18.04.1.tar.xz"; + sha256 = "0qjbzmjgcvxbpvbqxyyh02pk5hr6z871n13awsq770xwbr1pdnwc"; + name = "kbounce-18.04.1.tar.xz"; }; }; kbreakout = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz"; - sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n"; - name = "kbreakout-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kbreakout-18.04.1.tar.xz"; + sha256 = "0yr9hwlwdp1fi2parzniyq5rfv4fxbxxs63xfggaz7ndbm1h8bif"; + name = "kbreakout-18.04.1.tar.xz"; }; }; kbruch = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz"; - sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk"; - name = "kbruch-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kbruch-18.04.1.tar.xz"; + sha256 = "08wb7f2jhz3dkx22sj2k4sairl715nrk7c2swd88dcaskcy411nk"; + name = "kbruch-18.04.1.tar.xz"; }; }; kcachegrind = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz"; - sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0"; - name = "kcachegrind-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcachegrind-18.04.1.tar.xz"; + sha256 = "1mig7xm67w3vwslymbfm51w8w9cnqzk41kqp998j6g7dfrh8476g"; + name = "kcachegrind-18.04.1.tar.xz"; }; }; kcalc = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz"; - sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d"; - name = "kcalc-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcalc-18.04.1.tar.xz"; + sha256 = "14j2w9w31cqmsls3zrgifywbz5bxkzkryggfd1jxiz9q526ylpxy"; + name = "kcalc-18.04.1.tar.xz"; }; }; kcalcore = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz"; - sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m"; - name = "kcalcore-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcalcore-18.04.1.tar.xz"; + sha256 = "0q23pb9pkii6czk3angl3xzlzc90fck1pwc05695rz90iwbxq62x"; + name = "kcalcore-18.04.1.tar.xz"; }; }; kcalutils = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz"; - sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1"; - name = "kcalutils-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcalutils-18.04.1.tar.xz"; + sha256 = "05ma56f0ly8nq62p6nlzkscdq5m93142kakhqrsl17c902bvkcmm"; + name = "kcalutils-18.04.1.tar.xz"; }; }; kcharselect = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz"; - sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9"; - name = "kcharselect-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcharselect-18.04.1.tar.xz"; + sha256 = "0pv22v1x3n73rxzpihsxz5xxy1c37lq72jcscwylwmwfyszmvdwx"; + name = "kcharselect-18.04.1.tar.xz"; }; }; kcolorchooser = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz"; - sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn"; - name = "kcolorchooser-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcolorchooser-18.04.1.tar.xz"; + sha256 = "1wzy9a3pz0jwwmgbqxqlfii0faascrxnxq398wzrnx955shlksbm"; + name = "kcolorchooser-18.04.1.tar.xz"; }; }; kcontacts = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz"; - sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb"; - name = "kcontacts-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcontacts-18.04.1.tar.xz"; + sha256 = "0725cad646qzpgpvxl0vyb1a4hpbk0b6zb3wbdim4al56y7x1rxh"; + name = "kcontacts-18.04.1.tar.xz"; }; }; kcron = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz"; - sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18"; - name = "kcron-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kcron-18.04.1.tar.xz"; + sha256 = "1wlk36s6i53vk4crrvijbfmagh5d8sjbmcacdwdcf4vlb56kxphr"; + name = "kcron-18.04.1.tar.xz"; }; }; kdav = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz"; - sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2"; - name = "kdav-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdav-18.04.1.tar.xz"; + sha256 = "16abp767h4rs35yj0j8kgmhm4k09cidnsmh1ihx2b53ya1ivmv9b"; + name = "kdav-18.04.1.tar.xz"; }; }; kdebugsettings = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz"; - sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g"; - name = "kdebugsettings-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdebugsettings-18.04.1.tar.xz"; + sha256 = "1bz5wcap6kqjv6164zm7wcm31q634785lqlarsc5hqld5xjgr7ig"; + name = "kdebugsettings-18.04.1.tar.xz"; }; }; kde-dev-scripts = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz"; - sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8"; - name = "kde-dev-scripts-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kde-dev-scripts-18.04.1.tar.xz"; + sha256 = "08wsj1h44lmvvv43k9l3mxvi2hr498hz3d22z0bwcdjaqgvy60r5"; + name = "kde-dev-scripts-18.04.1.tar.xz"; }; }; kde-dev-utils = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz"; - sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci"; - name = "kde-dev-utils-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kde-dev-utils-18.04.1.tar.xz"; + sha256 = "13wpa4xrkm3711vdwjkklibaf7as64klw4hpq9s9vx33ma73sf9a"; + name = "kde-dev-utils-18.04.1.tar.xz"; }; }; kdeedu-data = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz"; - sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q"; - name = "kdeedu-data-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdeedu-data-18.04.1.tar.xz"; + sha256 = "1ccf8bjd2fc2chgf63bwg91c0r4acxf40w81rssi83wjvnhg4d5j"; + name = "kdeedu-data-18.04.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz"; - sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn"; - name = "kdegraphics-mobipocket-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-mobipocket-18.04.1.tar.xz"; + sha256 = "1y9bjnpbpriyhs007wli7m0q5g9wv2d7izp0qxk4xzmrrw7k5v51"; + name = "kdegraphics-mobipocket-18.04.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz"; - sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh"; - name = "kdegraphics-thumbnailers-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-thumbnailers-18.04.1.tar.xz"; + sha256 = "06798hwxyd2xvf3aiigwzd53frzi0mqxsbxliznqxxjvk5lcp1ha"; + name = "kdegraphics-thumbnailers-18.04.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz"; - sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg"; - name = "kdenetwork-filesharing-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdenetwork-filesharing-18.04.1.tar.xz"; + sha256 = "18dilp18312v1zbrfq5rq223s6cy2lmdmgvp2hg5a25rmldw1yiw"; + name = "kdenetwork-filesharing-18.04.1.tar.xz"; }; }; kdenlive = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz"; - sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah"; - name = "kdenlive-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdenlive-18.04.1.tar.xz"; + sha256 = "059xqybn3r1w432mbnxx5ds1whj5x23ym2lm90wg23b9hmmmhxl3"; + name = "kdenlive-18.04.1.tar.xz"; }; }; kdepim-addons = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz"; - sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc"; - name = "kdepim-addons-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdepim-addons-18.04.1.tar.xz"; + sha256 = "1qninnlhwmkw6nxxymjww1x7krm87nz5m6p66y3ghrgyl0q16k7b"; + name = "kdepim-addons-18.04.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz"; - sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz"; - name = "kdepim-apps-libs-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdepim-apps-libs-18.04.1.tar.xz"; + sha256 = "1a41km8nhgrc24qlgh64560p8il6q9dlcmy25x92s1xmpn1zg1lc"; + name = "kdepim-apps-libs-18.04.1.tar.xz"; }; }; kdepim-runtime = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz"; - sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz"; - name = "kdepim-runtime-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdepim-runtime-18.04.1.tar.xz"; + sha256 = "0gl2wkkaxpz13rg6zyclcjkc0i7qwqwxcvamgb3cl6l6qkp869w1"; + name = "kdepim-runtime-18.04.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz"; - sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h"; - name = "kdesdk-kioslaves-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdesdk-kioslaves-18.04.1.tar.xz"; + sha256 = "1mx3pg36mx0b6v2kq3a3spxm40rdk4bgkhzzjwphppqkxc57bgln"; + name = "kdesdk-kioslaves-18.04.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz"; - sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g"; - name = "kdesdk-thumbnailers-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdesdk-thumbnailers-18.04.1.tar.xz"; + sha256 = "0s07h5kfl2h2w0qarz28362n92jdbbq7iw4cy93p949mp6jz1xij"; + name = "kdesdk-thumbnailers-18.04.1.tar.xz"; }; }; kdf = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz"; - sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv"; - name = "kdf-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdf-18.04.1.tar.xz"; + sha256 = "1hmq92vglivs9q536g3qx0b7v3g7nlvkly81p8brqs55cw0npf8d"; + name = "kdf-18.04.1.tar.xz"; }; }; kdialog = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz"; - sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn"; - name = "kdialog-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdialog-18.04.1.tar.xz"; + sha256 = "0xmdzwawa43xfv9a2sm2rijiiik7b0cvpbcxvwf7s37gwrw5fk05"; + name = "kdialog-18.04.1.tar.xz"; }; }; kdiamond = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz"; - sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9"; - name = "kdiamond-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kdiamond-18.04.1.tar.xz"; + sha256 = "12z0v4w8adlzsnymn5dsc1fpgqx2w3hx38chwc7l2l5bvgx5ycc1"; + name = "kdiamond-18.04.1.tar.xz"; }; }; keditbookmarks = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz"; - sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7"; - name = "keditbookmarks-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/keditbookmarks-18.04.1.tar.xz"; + sha256 = "1qi8y5j9s9d4i6vqvw5h29b55q73zfgj4v76dxdl1z85ghcv0my4"; + name = "keditbookmarks-18.04.1.tar.xz"; }; }; kfind = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz"; - sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw"; - name = "kfind-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kfind-18.04.1.tar.xz"; + sha256 = "15fha4k00s88n0k7ad0bnw9iyyjyxlhjmnlcr84hfbh6wiwn4l4k"; + name = "kfind-18.04.1.tar.xz"; }; }; kfloppy = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz"; - sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj"; - name = "kfloppy-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kfloppy-18.04.1.tar.xz"; + sha256 = "0rw3r09zil7121ssms1mvccw435nmmgmz0zx0rmfvpk6bks0cim9"; + name = "kfloppy-18.04.1.tar.xz"; }; }; kfourinline = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz"; - sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q"; - name = "kfourinline-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kfourinline-18.04.1.tar.xz"; + sha256 = "0gm8s8gi9nnilcvmnz4gk26wrszjg7y8xfq4dyqw87axwaqcv2z6"; + name = "kfourinline-18.04.1.tar.xz"; }; }; kgeography = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz"; - sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v"; - name = "kgeography-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kgeography-18.04.1.tar.xz"; + sha256 = "16c2gidj8jc4xr35ph392gh4r75vfiqw7n07lpv30d6v3h1mq2jy"; + name = "kgeography-18.04.1.tar.xz"; }; }; kget = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz"; - sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx"; - name = "kget-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kget-18.04.1.tar.xz"; + sha256 = "1kzvalb1a27bn9ac4iqkgar7fydspd9bhva3n0v9gzz34p3lv1f7"; + name = "kget-18.04.1.tar.xz"; }; }; kgoldrunner = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz"; - sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z"; - name = "kgoldrunner-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kgoldrunner-18.04.1.tar.xz"; + sha256 = "0w1vppp0r1prciz6gg5srlj0z05m5wcbpp3wwz6wxh2vnpbm2lc1"; + name = "kgoldrunner-18.04.1.tar.xz"; }; }; kgpg = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz"; - sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78"; - name = "kgpg-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kgpg-18.04.1.tar.xz"; + sha256 = "0b2kngq4dqs3qxkvxny72sfm2xlbsmhb986zmpp0wsm09gd6lhyh"; + name = "kgpg-18.04.1.tar.xz"; }; }; khangman = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz"; - sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c"; - name = "khangman-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/khangman-18.04.1.tar.xz"; + sha256 = "1vcr5gp3gz0dygkn8dhkg3fpyqny8vc61nymwii4v247znhg7hw4"; + name = "khangman-18.04.1.tar.xz"; }; }; khelpcenter = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz"; - sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr"; - name = "khelpcenter-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/khelpcenter-18.04.1.tar.xz"; + sha256 = "00p3s5zmql82dwr4lmfy3yqyyn7h2209lhf49cajh01hd2nasig1"; + name = "khelpcenter-18.04.1.tar.xz"; }; }; kidentitymanagement = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz"; - sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw"; - name = "kidentitymanagement-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kidentitymanagement-18.04.1.tar.xz"; + sha256 = "1lb1vl3r7avj45lfrlabbbkq0f7anpx04g20ajn2n8ajfgjpns9q"; + name = "kidentitymanagement-18.04.1.tar.xz"; }; }; kig = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz"; - sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3"; - name = "kig-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kig-18.04.1.tar.xz"; + sha256 = "1ry2rgmy7y4wyxwwz2f7qrj5aw5sjgv46vs4x5203v514p625nzw"; + name = "kig-18.04.1.tar.xz"; }; }; kigo = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz"; - sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp"; - name = "kigo-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kigo-18.04.1.tar.xz"; + sha256 = "1l2bdxjv5kiz6f0gmqwd43jghps5l2cvw8228ay4l7r4r9wp0ihr"; + name = "kigo-18.04.1.tar.xz"; }; }; killbots = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz"; - sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2"; - name = "killbots-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/killbots-18.04.1.tar.xz"; + sha256 = "06vqgahirw01zfbhr2dj5z7fd2jay3kizvl04wwwp1fr8jsw3plw"; + name = "killbots-18.04.1.tar.xz"; }; }; kimagemapeditor = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz"; - sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br"; - name = "kimagemapeditor-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kimagemapeditor-18.04.1.tar.xz"; + sha256 = "1144z9zasc3x678q8xnk98nn5y0bzaal0lxc6xb51ib4q8q2lhn1"; + name = "kimagemapeditor-18.04.1.tar.xz"; }; }; kimap = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz"; - sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by"; - name = "kimap-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kimap-18.04.1.tar.xz"; + sha256 = "03y1n4rf7xdxb82716wijz196dk0rg8d50rs9kycymys9sgq5y0h"; + name = "kimap-18.04.1.tar.xz"; }; }; kio-extras = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz"; - sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil"; - name = "kio-extras-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kio-extras-18.04.1.tar.xz"; + sha256 = "0635iam41i5afjspw08x99irqfsj7pa1w8wz4nfbx9yv2iclq1rh"; + name = "kio-extras-18.04.1.tar.xz"; }; }; kiriki = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz"; - sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf"; - name = "kiriki-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kiriki-18.04.1.tar.xz"; + sha256 = "0n258bvhd5cgb978zqqkig6is5fb9idvwa7n860q1r2nimsnch5y"; + name = "kiriki-18.04.1.tar.xz"; }; }; kiten = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz"; - sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah"; - name = "kiten-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kiten-18.04.1.tar.xz"; + sha256 = "1f6z5assiz6gxvhcp08x71qk3hyc36ib2sr6bmq0q7cbb7xlhbac"; + name = "kiten-18.04.1.tar.xz"; }; }; kjumpingcube = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz"; - sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl"; - name = "kjumpingcube-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kjumpingcube-18.04.1.tar.xz"; + sha256 = "0p4manwh4pndhdnb45fczllpsvswwwgvz1wk8grx2axq0x6pjjln"; + name = "kjumpingcube-18.04.1.tar.xz"; }; }; kldap = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz"; - sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9"; - name = "kldap-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kldap-18.04.1.tar.xz"; + sha256 = "0arriibg2flqr8rvd4fa8xd4rgr1rl3pwhxxskpfi4i3rl8w1a2i"; + name = "kldap-18.04.1.tar.xz"; }; }; kleopatra = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz"; - sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908"; - name = "kleopatra-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kleopatra-18.04.1.tar.xz"; + sha256 = "0ayjxvm6sdg1waf44nw360nh740vi29c7m6frq2jyfbxn401x7p3"; + name = "kleopatra-18.04.1.tar.xz"; }; }; klettres = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz"; - sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3"; - name = "klettres-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/klettres-18.04.1.tar.xz"; + sha256 = "1vzr8pf6m24ng3kg44ld5hiap7qqfp2w1q7npyr6sq28rrm8jilb"; + name = "klettres-18.04.1.tar.xz"; }; }; klickety = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz"; - sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc"; - name = "klickety-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/klickety-18.04.1.tar.xz"; + sha256 = "1wk6g4a8gmd1z8qqgy30s3f2zgq651dv38gnbk3949j81k92084m"; + name = "klickety-18.04.1.tar.xz"; }; }; klines = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz"; - sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1"; - name = "klines-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/klines-18.04.1.tar.xz"; + sha256 = "0zslagiphj37i79896k71j40125nz74qknx75sp3iv2wafy0akgf"; + name = "klines-18.04.1.tar.xz"; }; }; kmag = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz"; - sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f"; - name = "kmag-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmag-18.04.1.tar.xz"; + sha256 = "163i0axbnxkyqhbri6k48x9jsb5l5ll8hl0zvcsw0srh8bzswvgd"; + name = "kmag-18.04.1.tar.xz"; }; }; kmahjongg = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz"; - sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx"; - name = "kmahjongg-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmahjongg-18.04.1.tar.xz"; + sha256 = "1zl1mr8pg6sz2ydqilgdbh3758vw13af37s9g8pi7axva8adf0fp"; + name = "kmahjongg-18.04.1.tar.xz"; }; }; kmail = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz"; - sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r"; - name = "kmail-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmail-18.04.1.tar.xz"; + sha256 = "057727gsrdf0pkn5n17km5ryjiw5rimxixff0dax939d9403qwfg"; + name = "kmail-18.04.1.tar.xz"; }; }; kmail-account-wizard = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz"; - sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp"; - name = "kmail-account-wizard-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmail-account-wizard-18.04.1.tar.xz"; + sha256 = "0qky1a0lrmy8mfiq0dqhrd8j7m1lc9p34ivx9vy4rr82r9g3y5jw"; + name = "kmail-account-wizard-18.04.1.tar.xz"; }; }; kmailtransport = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz"; - sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f"; - name = "kmailtransport-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmailtransport-18.04.1.tar.xz"; + sha256 = "09l79049dpkzc3iqdxv4jvglpynrq976gvr8n38k63mr5sajwg72"; + name = "kmailtransport-18.04.1.tar.xz"; }; }; kmbox = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz"; - sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k"; - name = "kmbox-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmbox-18.04.1.tar.xz"; + sha256 = "05zcnykb7asamqf8iqs63bl7jk5myywdqydhxz56jr19fw32lyqq"; + name = "kmbox-18.04.1.tar.xz"; }; }; kmime = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz"; - sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx"; - name = "kmime-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmime-18.04.1.tar.xz"; + sha256 = "1jlhlxw31c9g7z6yhqjsp76xm85ywrr0in4qazidwb9k8lkqxa7g"; + name = "kmime-18.04.1.tar.xz"; }; }; kmines = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz"; - sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705"; - name = "kmines-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmines-18.04.1.tar.xz"; + sha256 = "0i88pc7j18xighw8ii6gh5gxq9k2zy372ggdyany91dcjgmwhgw7"; + name = "kmines-18.04.1.tar.xz"; }; }; kmix = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz"; - sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg"; - name = "kmix-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmix-18.04.1.tar.xz"; + sha256 = "1jq71pgnlz95na5fbm504pkrrahiclqbb0cwsqpbpi10m2nzcrwd"; + name = "kmix-18.04.1.tar.xz"; }; }; kmousetool = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz"; - sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7"; - name = "kmousetool-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmousetool-18.04.1.tar.xz"; + sha256 = "08g5k9yfd5wrh47zp99hgq634vd9r23gjlr77xg86jqn8dj2lgqx"; + name = "kmousetool-18.04.1.tar.xz"; }; }; kmouth = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz"; - sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk"; - name = "kmouth-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmouth-18.04.1.tar.xz"; + sha256 = "08m5r9vd0gb06izav2g21qkfmg1gjpj0kn0nh785bbhs0bbngrci"; + name = "kmouth-18.04.1.tar.xz"; }; }; kmplot = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz"; - sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v"; - name = "kmplot-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kmplot-18.04.1.tar.xz"; + sha256 = "01rxnc45jc6swsm2h8bw45n96lsalgbfzww18hlq1qpyjr20181h"; + name = "kmplot-18.04.1.tar.xz"; }; }; knavalbattle = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz"; - sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv"; - name = "knavalbattle-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/knavalbattle-18.04.1.tar.xz"; + sha256 = "1kr37qmb4577i12wghc0qcbbqpxr2wzww1cqv0wcd9jmjd3mq1xw"; + name = "knavalbattle-18.04.1.tar.xz"; }; }; knetwalk = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz"; - sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x"; - name = "knetwalk-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/knetwalk-18.04.1.tar.xz"; + sha256 = "02zpndbbyffakdxxswpmb1hrszh78a3ip6mfr8bqwnwbvzh80cjy"; + name = "knetwalk-18.04.1.tar.xz"; }; }; knotes = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz"; - sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh"; - name = "knotes-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/knotes-18.04.1.tar.xz"; + sha256 = "0jc9mpnwgrbh8pra75gsiy9wm0aylm9a0ssw8bhfivb77dmqr44c"; + name = "knotes-18.04.1.tar.xz"; }; }; kolf = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz"; - sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn"; - name = "kolf-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kolf-18.04.1.tar.xz"; + sha256 = "1bahv98dskknyy8rxpnjxywpcw09x58bsdg0aqgh5xdm0ym992ik"; + name = "kolf-18.04.1.tar.xz"; }; }; kollision = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz"; - sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i"; - name = "kollision-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kollision-18.04.1.tar.xz"; + sha256 = "0pr4f9inxp77d761byis30jski642bhcfvbpcpnj9fi3k1cgzcna"; + name = "kollision-18.04.1.tar.xz"; }; }; kolourpaint = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz"; - sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr"; - name = "kolourpaint-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kolourpaint-18.04.1.tar.xz"; + sha256 = "1lfvmk9vhwa8j454pfh0x1klqb360zlsyydiiqm5a4dhc4wvcwzy"; + name = "kolourpaint-18.04.1.tar.xz"; }; }; kompare = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz"; - sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi"; - name = "kompare-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kompare-18.04.1.tar.xz"; + sha256 = "0kmf245fbm32hdgmyiv51ham3py7jhc3zpwfcfxbjyi94ikx4n79"; + name = "kompare-18.04.1.tar.xz"; }; }; konqueror = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz"; - sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2"; - name = "konqueror-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/konqueror-18.04.1.tar.xz"; + sha256 = "0798z1pm7sxi93xy4jibzhff8k37q88l59kyz524kl7m8wnw5scj"; + name = "konqueror-18.04.1.tar.xz"; }; }; konquest = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz"; - sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx"; - name = "konquest-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/konquest-18.04.1.tar.xz"; + sha256 = "0h637lpmdsascp178fi5mpl9825n83r094ff8l5k4dnfks5imgv4"; + name = "konquest-18.04.1.tar.xz"; }; }; konsole = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz"; - sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k"; - name = "konsole-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/konsole-18.04.1.tar.xz"; + sha256 = "0hnyi5361glmal69brqc9h6zcv8z4l8va6nv0hc2siafmj21yhw6"; + name = "konsole-18.04.1.tar.xz"; }; }; kontact = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz"; - sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz"; - name = "kontact-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kontact-18.04.1.tar.xz"; + sha256 = "00xaizfnfvh39xnxq2jp9n9cl7f0a22hlndamjfhw126ji0mz052"; + name = "kontact-18.04.1.tar.xz"; }; }; kontactinterface = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz"; - sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x"; - name = "kontactinterface-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kontactinterface-18.04.1.tar.xz"; + sha256 = "1zywgcrwzgw56vx2x0f2f0235bs2aikvn2qfizv4m5ac7ydihnyd"; + name = "kontactinterface-18.04.1.tar.xz"; }; }; kopete = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz"; - sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl"; - name = "kopete-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kopete-18.04.1.tar.xz"; + sha256 = "1isxabxxx48vjzihycv80fapx69qrvv5zlyfrdg42s9qxqkcgvi8"; + name = "kopete-18.04.1.tar.xz"; }; }; korganizer = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz"; - sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2"; - name = "korganizer-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/korganizer-18.04.1.tar.xz"; + sha256 = "1x3n03200j79xrj4y7046l3sa3qqfys3z2d2b1nl22v8g3l8gyx2"; + name = "korganizer-18.04.1.tar.xz"; }; }; kpat = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz"; - sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728"; - name = "kpat-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kpat-18.04.1.tar.xz"; + sha256 = "1fly7cd895v6k991hjvq4cv22dibzsvihzcj9cl9pzc7dk9vp70v"; + name = "kpat-18.04.1.tar.xz"; }; }; kpimtextedit = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz"; - sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68"; - name = "kpimtextedit-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kpimtextedit-18.04.1.tar.xz"; + sha256 = "09513fv0kaa7x01lsnpm18vvxijcwb68hdglbw08n5f7135k79mn"; + name = "kpimtextedit-18.04.1.tar.xz"; }; }; kqtquickcharts = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz"; - sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8"; - name = "kqtquickcharts-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kqtquickcharts-18.04.1.tar.xz"; + sha256 = "08y0nc070pjmf07yifkfd6dm3frma752c42m3ms0ysz96l1x2gr1"; + name = "kqtquickcharts-18.04.1.tar.xz"; }; }; krdc = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz"; - sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9"; - name = "krdc-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/krdc-18.04.1.tar.xz"; + sha256 = "166990llgfkbysahrfralc6n2g7ix7h4w1fpzss0axfigz5ink1x"; + name = "krdc-18.04.1.tar.xz"; }; }; kreversi = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz"; - sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8"; - name = "kreversi-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kreversi-18.04.1.tar.xz"; + sha256 = "0g6jc7s54i4gzb5q9cg4qczwx9i4zir52zqnjl5akr1w9v8d2m34"; + name = "kreversi-18.04.1.tar.xz"; }; }; krfb = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz"; - sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc"; - name = "krfb-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/krfb-18.04.1.tar.xz"; + sha256 = "1zd3rgp4265r1fi1kc2s09rrzpa22b9j56cq3l50mzkb80kyi6vl"; + name = "krfb-18.04.1.tar.xz"; }; }; kross-interpreters = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz"; - sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y"; - name = "kross-interpreters-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kross-interpreters-18.04.1.tar.xz"; + sha256 = "1gybf7diq2amaqs7xaikfh1kp40iwfvxz4bms16b6flck8sja8va"; + name = "kross-interpreters-18.04.1.tar.xz"; }; }; kruler = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz"; - sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr"; - name = "kruler-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kruler-18.04.1.tar.xz"; + sha256 = "0bkf1cm23582hwz4j3xygrwqwbfq27qycvnf2mqw921j08axa376"; + name = "kruler-18.04.1.tar.xz"; }; }; kshisen = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz"; - sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf"; - name = "kshisen-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kshisen-18.04.1.tar.xz"; + sha256 = "098qqzii4wk0pv5388yighy381k5ffrb8wy4z461yxgxc75d77f7"; + name = "kshisen-18.04.1.tar.xz"; }; }; ksirk = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz"; - sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8"; - name = "ksirk-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ksirk-18.04.1.tar.xz"; + sha256 = "0mxj4vp6da535ghnxisk6j7akhis0fh16kj6bycw8fxxl5jiy0sq"; + name = "ksirk-18.04.1.tar.xz"; }; }; ksmtp = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz"; - sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn"; - name = "ksmtp-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ksmtp-18.04.1.tar.xz"; + sha256 = "0imfcaisvh78s18x2w4iizr4vn6sndr1nk9585vs9dr8wcwbfrl3"; + name = "ksmtp-18.04.1.tar.xz"; }; }; ksnakeduel = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz"; - sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w"; - name = "ksnakeduel-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ksnakeduel-18.04.1.tar.xz"; + sha256 = "07p9nil9x3cyzzxcr59h3rj9h6g1lfssrsi6iqwq0hpdc6h2zl73"; + name = "ksnakeduel-18.04.1.tar.xz"; }; }; kspaceduel = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz"; - sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i"; - name = "kspaceduel-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kspaceduel-18.04.1.tar.xz"; + sha256 = "0aar147l5bq1ij40ng5wbdixg91678r3d07lrnmdffb47wa1ly7n"; + name = "kspaceduel-18.04.1.tar.xz"; }; }; ksquares = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz"; - sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn"; - name = "ksquares-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ksquares-18.04.1.tar.xz"; + sha256 = "1vr9xdi0jfrjwvq5y04djmnax7q4d5amj8a7mzvvqq427zl6xc3c"; + name = "ksquares-18.04.1.tar.xz"; }; }; ksudoku = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz"; - sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3"; - name = "ksudoku-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ksudoku-18.04.1.tar.xz"; + sha256 = "0habss3w7m3x8mhh70qq38nymynvihar9clpxmlp6pbyw8sl9v6n"; + name = "ksudoku-18.04.1.tar.xz"; }; }; ksystemlog = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz"; - sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780"; - name = "ksystemlog-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ksystemlog-18.04.1.tar.xz"; + sha256 = "1yyrbdzjxrlf96l3bvj675fsbn6440lxr1nd5j4rs09d3fyvl6p1"; + name = "ksystemlog-18.04.1.tar.xz"; }; }; kteatime = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz"; - sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3"; - name = "kteatime-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kteatime-18.04.1.tar.xz"; + sha256 = "02849i02h0zmsc3wifzgq9s0mgfdyzdrm61ngq944r260anizxhd"; + name = "kteatime-18.04.1.tar.xz"; }; }; ktimer = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz"; - sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj"; - name = "ktimer-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktimer-18.04.1.tar.xz"; + sha256 = "13k0wmjh925sj7l8n4kc0adva1vfbgs6admh80ch0xwk8mmsdjvp"; + name = "ktimer-18.04.1.tar.xz"; }; }; ktnef = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz"; - sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36"; - name = "ktnef-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktnef-18.04.1.tar.xz"; + sha256 = "1m6nbsnbh8apyqaw2kivkzhk7fp9y2xphmrblqdpf49qpbh6jqlq"; + name = "ktnef-18.04.1.tar.xz"; }; }; ktouch = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz"; - sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v"; - name = "ktouch-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktouch-18.04.1.tar.xz"; + sha256 = "18piwwdq4hl8yaln7s7p4bw0lwkyjwnw8lknirj1352npycvq2n1"; + name = "ktouch-18.04.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz"; - sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s"; - name = "ktp-accounts-kcm-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-accounts-kcm-18.04.1.tar.xz"; + sha256 = "1ihxvngg6cp1vzhpf4hkf2zwxpa5gnlq11lc1ffnhy7fm7ig28nx"; + name = "ktp-accounts-kcm-18.04.1.tar.xz"; }; }; ktp-approver = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz"; - sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4"; - name = "ktp-approver-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-approver-18.04.1.tar.xz"; + sha256 = "1749l1zklk1q7i3z4mbk24566vps74hj3as4ijybgymczr4rd3gz"; + name = "ktp-approver-18.04.1.tar.xz"; }; }; ktp-auth-handler = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz"; - sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y"; - name = "ktp-auth-handler-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-auth-handler-18.04.1.tar.xz"; + sha256 = "0llkw1yqi91s8iqdqz8pskccinmjsgbp1081pngpkqcg1iy7bara"; + name = "ktp-auth-handler-18.04.1.tar.xz"; }; }; ktp-call-ui = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz"; - sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm"; - name = "ktp-call-ui-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-call-ui-18.04.1.tar.xz"; + sha256 = "1pji4z8h7bk5npl279x5g9hx7zgdhnjdrv669nrd1gi9m20n6vi7"; + name = "ktp-call-ui-18.04.1.tar.xz"; }; }; ktp-common-internals = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz"; - sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av"; - name = "ktp-common-internals-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-common-internals-18.04.1.tar.xz"; + sha256 = "0jwkwznqcrk39k07srl7c0yznj9p9dp70lkfhjg3syscwm8drydv"; + name = "ktp-common-internals-18.04.1.tar.xz"; }; }; ktp-contact-list = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz"; - sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y"; - name = "ktp-contact-list-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-list-18.04.1.tar.xz"; + sha256 = "1806fapr0pv15dmpqb0khdlgrmk9bsf45s1ab7x9pdnghnawn132"; + name = "ktp-contact-list-18.04.1.tar.xz"; }; }; ktp-contact-runner = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz"; - sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli"; - name = "ktp-contact-runner-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-runner-18.04.1.tar.xz"; + sha256 = "0b9xm5p9w5kd67sh13h9caxqj89jzia79hfk9fzxpjbf0kifj72s"; + name = "ktp-contact-runner-18.04.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz"; - sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji"; - name = "ktp-desktop-applets-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-desktop-applets-18.04.1.tar.xz"; + sha256 = "0jrdz8ccgrbwpb6k73wvsix3h3h16dxzgqy19lykd5igckq1v2qh"; + name = "ktp-desktop-applets-18.04.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz"; - sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5"; - name = "ktp-filetransfer-handler-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-filetransfer-handler-18.04.1.tar.xz"; + sha256 = "03v0wgac6knprqi7mfzc3w1rrdkf9lgi2gpscc3k910dyswh1802"; + name = "ktp-filetransfer-handler-18.04.1.tar.xz"; }; }; ktp-kded-module = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz"; - sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj"; - name = "ktp-kded-module-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-kded-module-18.04.1.tar.xz"; + sha256 = "0d3vv1ngsbh87wxijvyd2hzhdzwr0r5vx5h3jdl3znjh9ysifwm4"; + name = "ktp-kded-module-18.04.1.tar.xz"; }; }; ktp-send-file = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz"; - sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l"; - name = "ktp-send-file-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-send-file-18.04.1.tar.xz"; + sha256 = "1p3vgbsmam687bzp1h6xxv2qr2f6jz6mjbpk5jxjvvz66aq4dj8y"; + name = "ktp-send-file-18.04.1.tar.xz"; }; }; ktp-text-ui = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz"; - sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km"; - name = "ktp-text-ui-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktp-text-ui-18.04.1.tar.xz"; + sha256 = "1zsxyizm9vdlrxicxvgmy5irqi914szxkd38xrgspp2vdi4bnvb6"; + name = "ktp-text-ui-18.04.1.tar.xz"; }; }; ktuberling = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz"; - sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d"; - name = "ktuberling-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/ktuberling-18.04.1.tar.xz"; + sha256 = "1rpval4rl63dfy2p6aq5902ifvv14x1zg8mzzci26kqq8k38jasc"; + name = "ktuberling-18.04.1.tar.xz"; }; }; kturtle = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz"; - sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62"; - name = "kturtle-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kturtle-18.04.1.tar.xz"; + sha256 = "1s2n46nlzc63108gc43h14yjrcd12h93bvbg08ynhfaq26pqz1jk"; + name = "kturtle-18.04.1.tar.xz"; }; }; kubrick = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz"; - sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy"; - name = "kubrick-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kubrick-18.04.1.tar.xz"; + sha256 = "1gqnfc8gnl96gz5i3ak7swhm36c9dv7n0c4b5f70pnsi5n7klbxr"; + name = "kubrick-18.04.1.tar.xz"; }; }; kwalletmanager = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz"; - sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q"; - name = "kwalletmanager-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kwalletmanager-18.04.1.tar.xz"; + sha256 = "0vj0ch1dk265v6x8xzvskpv5mc564p10pn8m9jjv79wk2xy1vsjz"; + name = "kwalletmanager-18.04.1.tar.xz"; }; }; kwave = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz"; - sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53"; - name = "kwave-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kwave-18.04.1.tar.xz"; + sha256 = "0avbyyrhvzfxdib0d80rk7m6gk6kq9rjvv640s08y237m68fncap"; + name = "kwave-18.04.1.tar.xz"; }; }; kwordquiz = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz"; - sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y"; - name = "kwordquiz-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/kwordquiz-18.04.1.tar.xz"; + sha256 = "1yqynfmlargfwk7nlfzhlxd1df462ssw7qj3pdhym8277jfch58r"; + name = "kwordquiz-18.04.1.tar.xz"; }; }; libgravatar = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz"; - sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1"; - name = "libgravatar-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libgravatar-18.04.1.tar.xz"; + sha256 = "19xrc70yh6baxg5jlr3v3d3af46vms28jzvkpgda5ffacnn3xnrj"; + name = "libgravatar-18.04.1.tar.xz"; }; }; libkcddb = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz"; - sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa"; - name = "libkcddb-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkcddb-18.04.1.tar.xz"; + sha256 = "1nn80sflfgzd3d2kc4d4zwa09ix498svrinn27b9h8x3w3gsbg8f"; + name = "libkcddb-18.04.1.tar.xz"; }; }; libkcompactdisc = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz"; - sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb"; - name = "libkcompactdisc-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkcompactdisc-18.04.1.tar.xz"; + sha256 = "12zb39zwvl8y2b48vjn34dxj4f65laswd67w5f7m4g0nczq218v1"; + name = "libkcompactdisc-18.04.1.tar.xz"; }; }; libkdcraw = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz"; - sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik"; - name = "libkdcraw-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkdcraw-18.04.1.tar.xz"; + sha256 = "011q982rx5m8609i1zd6q186xw3ps81fnvhjk69hxy5w8pp44m6i"; + name = "libkdcraw-18.04.1.tar.xz"; }; }; libkdegames = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz"; - sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6"; - name = "libkdegames-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkdegames-18.04.1.tar.xz"; + sha256 = "03afnypmn8bz1cgc4lgfmid2hszsq564hsf9m5s57a29vfswnp6m"; + name = "libkdegames-18.04.1.tar.xz"; }; }; libkdepim = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz"; - sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq"; - name = "libkdepim-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkdepim-18.04.1.tar.xz"; + sha256 = "02wrkn1h662dqzp7kyrhhhiyahhkgqz75jcd59haxyj66amlgcx6"; + name = "libkdepim-18.04.1.tar.xz"; }; }; libkeduvocdocument = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz"; - sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw"; - name = "libkeduvocdocument-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkeduvocdocument-18.04.1.tar.xz"; + sha256 = "14i25wjfak39bz0y5rkg25mvjxnzpak76sf5w163dmwx2hd7spzr"; + name = "libkeduvocdocument-18.04.1.tar.xz"; }; }; libkexiv2 = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz"; - sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy"; - name = "libkexiv2-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkexiv2-18.04.1.tar.xz"; + sha256 = "0q6hmghivdj0aq00pg3z5i6mfdj3xgpdd6yw0vr9i4jnk0rfb349"; + name = "libkexiv2-18.04.1.tar.xz"; }; }; libkgapi = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz"; - sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli"; - name = "libkgapi-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkgapi-18.04.1.tar.xz"; + sha256 = "0wpxn7qyf56rckarx52ic3yyhv8r043dxjir4f2yf05vkddwkshv"; + name = "libkgapi-18.04.1.tar.xz"; }; }; libkgeomap = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz"; - sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh"; - name = "libkgeomap-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkgeomap-18.04.1.tar.xz"; + sha256 = "16rzw8r1i7isfh86rg86a0h25zwa8h3hnxbzf3fjmdn6mmdkp2va"; + name = "libkgeomap-18.04.1.tar.xz"; }; }; libkipi = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz"; - sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb"; - name = "libkipi-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkipi-18.04.1.tar.xz"; + sha256 = "09rx85phr259anznvxyfp4rb51jsid76jrbcgv52vy9cfd7rr8pk"; + name = "libkipi-18.04.1.tar.xz"; }; }; libkleo = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz"; - sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd"; - name = "libkleo-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkleo-18.04.1.tar.xz"; + sha256 = "06kyiv9bshyf2q0k7g7pm1ja35sxddgrzb5ayxnx03na86dm67j9"; + name = "libkleo-18.04.1.tar.xz"; }; }; libkmahjongg = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz"; - sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k"; - name = "libkmahjongg-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkmahjongg-18.04.1.tar.xz"; + sha256 = "09sqi1xyd8hk3x6w5ix6sa191ihil3zjq1qd6j50fr2rpqzfnbm0"; + name = "libkmahjongg-18.04.1.tar.xz"; }; }; libkomparediff2 = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz"; - sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy"; - name = "libkomparediff2-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libkomparediff2-18.04.1.tar.xz"; + sha256 = "0d00r0h1fbmhkdn791f3i87ckc4l8wd5rljlm4lfzcr95lbmpzyv"; + name = "libkomparediff2-18.04.1.tar.xz"; }; }; libksane = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz"; - sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i"; - name = "libksane-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libksane-18.04.1.tar.xz"; + sha256 = "1k1ffki9gcgah7xymyzbwza00gw3dvkfghcbyy4dpvbb0q4ayw7c"; + name = "libksane-18.04.1.tar.xz"; }; }; libksieve = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz"; - sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn"; - name = "libksieve-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/libksieve-18.04.1.tar.xz"; + sha256 = "0dsb1lj155y32avlgw6clxpbv00z3nrc7a7nlfh29l0wjl09mr50"; + name = "libksieve-18.04.1.tar.xz"; }; }; lokalize = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz"; - sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4"; - name = "lokalize-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/lokalize-18.04.1.tar.xz"; + sha256 = "1svwl30abycdq2jc4a688lbb4yk28dqscchi1zshdii6w00bcys9"; + name = "lokalize-18.04.1.tar.xz"; }; }; lskat = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz"; - sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7"; - name = "lskat-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/lskat-18.04.1.tar.xz"; + sha256 = "0isy9ibk93i4b72cdv5210n8gfwiydrw4i0bax2pkyxqymyfr5lj"; + name = "lskat-18.04.1.tar.xz"; }; }; mailcommon = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz"; - sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd"; - name = "mailcommon-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/mailcommon-18.04.1.tar.xz"; + sha256 = "0s0c4swm1q331hzqg0fqb2r9dwx4aamwan3s5p71vjnibxzbmqck"; + name = "mailcommon-18.04.1.tar.xz"; }; }; mailimporter = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz"; - sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi"; - name = "mailimporter-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/mailimporter-18.04.1.tar.xz"; + sha256 = "1qzc7yjjscbxkinby9carp02wqppx95hirq0m5ihly7avn5cn6dz"; + name = "mailimporter-18.04.1.tar.xz"; }; }; marble = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz"; - sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv"; - name = "marble-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/marble-18.04.1.tar.xz"; + sha256 = "04aa32qnr585lq3s3hmxqlwqranr3wr1zr1xm99pbsb32k2yyyjn"; + name = "marble-18.04.1.tar.xz"; }; }; mbox-importer = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz"; - sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5"; - name = "mbox-importer-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/mbox-importer-18.04.1.tar.xz"; + sha256 = "06735201365rpp3lr877pqdkz9206zfzhvbbr432fvg6lx3p5z4s"; + name = "mbox-importer-18.04.1.tar.xz"; }; }; messagelib = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz"; - sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2"; - name = "messagelib-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/messagelib-18.04.1.tar.xz"; + sha256 = "1fznlxl1j1n5pbg3v7rmd4lhfjhr1r95b62gyqydlrrwgzzs92b2"; + name = "messagelib-18.04.1.tar.xz"; }; }; minuet = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz"; - sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh"; - name = "minuet-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/minuet-18.04.1.tar.xz"; + sha256 = "0fans0fpghdckmp6ww8api4d7kfna1w20yjgssvfqxgyxxni0vps"; + name = "minuet-18.04.1.tar.xz"; }; }; okular = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz"; - sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8"; - name = "okular-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/okular-18.04.1.tar.xz"; + sha256 = "0fhfbjlwa4xzf2q2wnidprj7qqizs26i959k61k4j66y66d2za0g"; + name = "okular-18.04.1.tar.xz"; }; }; palapeli = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz"; - sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b"; - name = "palapeli-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/palapeli-18.04.1.tar.xz"; + sha256 = "01p1xipacb8w7lcd3n8387c7axjxswvv62rn7sphp736l23wri5c"; + name = "palapeli-18.04.1.tar.xz"; }; }; parley = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz"; - sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if"; - name = "parley-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/parley-18.04.1.tar.xz"; + sha256 = "1qh7bg38bvq8drnd7plkdxxqsl6rgd37g3iqnxwljxf723s6hcz5"; + name = "parley-18.04.1.tar.xz"; }; }; picmi = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz"; - sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r"; - name = "picmi-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/picmi-18.04.1.tar.xz"; + sha256 = "095xm4nkd0kg0pvbbp3vasll1lfpk491frspk2463q0zhd04hpmi"; + name = "picmi-18.04.1.tar.xz"; }; }; pimcommon = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz"; - sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp"; - name = "pimcommon-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/pimcommon-18.04.1.tar.xz"; + sha256 = "0zyd0ja6ir6nbkvf4hk6hi93qr19kns8hgww15y2xmdhdcyf52ja"; + name = "pimcommon-18.04.1.tar.xz"; }; }; pim-data-exporter = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz"; - sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7"; - name = "pim-data-exporter-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/pim-data-exporter-18.04.1.tar.xz"; + sha256 = "0k69nmjp0n2mmg1nsghghk2ybnvyr01gnrhqwvknpbncb2cnkgcg"; + name = "pim-data-exporter-18.04.1.tar.xz"; }; }; pim-sieve-editor = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz"; - sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a"; - name = "pim-sieve-editor-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/pim-sieve-editor-18.04.1.tar.xz"; + sha256 = "076hzkia8l61nn3gwma88lsx02d1fb6d00jbibvghqp7raa9f0fx"; + name = "pim-sieve-editor-18.04.1.tar.xz"; }; }; poxml = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz"; - sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv"; - name = "poxml-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/poxml-18.04.1.tar.xz"; + sha256 = "1ha1dy5j40269nv5ygb0idd9kkizni3zq4vz64i2y29lvbrqdgh1"; + name = "poxml-18.04.1.tar.xz"; }; }; print-manager = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz"; - sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx"; - name = "print-manager-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/print-manager-18.04.1.tar.xz"; + sha256 = "10l2w1fyym4nflmqnfsxdnnbllvliwyx7z7ylmi4i4rkcpaafyqx"; + name = "print-manager-18.04.1.tar.xz"; }; }; rocs = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz"; - sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4"; - name = "rocs-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/rocs-18.04.1.tar.xz"; + sha256 = "1bsm1kjkp9x2rh4n682kjyljisri7mniw5yap4ifksq5lk2vbn8z"; + name = "rocs-18.04.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz"; - sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0"; - name = "signon-kwallet-extension-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/signon-kwallet-extension-18.04.1.tar.xz"; + sha256 = "0xhvah1xq60wiz6pyjkc66sxsz1v3vdzjbjdr5kklpr98pg9xlib"; + name = "signon-kwallet-extension-18.04.1.tar.xz"; }; }; spectacle = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz"; - sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2"; - name = "spectacle-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/spectacle-18.04.1.tar.xz"; + sha256 = "0k8vl79gwm4sj0f5pshz99l6cq323hk7a4r1jqzkdmbdv1mc0rgc"; + name = "spectacle-18.04.1.tar.xz"; }; }; step = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz"; - sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4"; - name = "step-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/step-18.04.1.tar.xz"; + sha256 = "1zwxjsjv72wjvzwj7cdz3lclw92bp9306bcpm4bpfrlcnr3xny1z"; + name = "step-18.04.1.tar.xz"; }; }; svgpart = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz"; - sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp"; - name = "svgpart-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/svgpart-18.04.1.tar.xz"; + sha256 = "14qf9xfgvgk8d49qz6vhfivzw8hsmj6q2scjk6vg3i16y62qlym9"; + name = "svgpart-18.04.1.tar.xz"; }; }; sweeper = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz"; - sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331"; - name = "sweeper-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/sweeper-18.04.1.tar.xz"; + sha256 = "0f8nyxdw2arpa85vwl834jqbydvsx7dswjl8cdy66frx5jyqirim"; + name = "sweeper-18.04.1.tar.xz"; }; }; syndication = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz"; - sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n"; - name = "syndication-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/syndication-18.04.1.tar.xz"; + sha256 = "1gcas0aqgzr6r571d66yn7hw86hdb4akd5vgk5jh3liww25y8qm5"; + name = "syndication-18.04.1.tar.xz"; }; }; umbrello = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz"; - sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp"; - name = "umbrello-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/umbrello-18.04.1.tar.xz"; + sha256 = "1vw8py5nm7mpv3qa0lxi72cvbvslxppag6aqhbp2zsnz6b152qhy"; + name = "umbrello-18.04.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.04.0"; + version = "18.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz"; - sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22"; - name = "zeroconf-ioslave-18.04.0.tar.xz"; + url = "${mirror}/stable/applications/18.04.1/src/zeroconf-ioslave-18.04.1.tar.xz"; + sha256 = "09nvkcq924v3f8jl36618j0hx2b1dzkvbvspf98mnx9lsliyzsc3"; + name = "zeroconf-ioslave-18.04.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b0b6111b334a23073f899bb715fc3dcd094e4db9 --- /dev/null +++ b/pkgs/applications/misc/1password/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "1password-${version}"; + version = "0.4"; + src = if stdenv.system == "i686-linux" then fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; + stripRoot = false; + } else fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; + stripRoot = false; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + install -D op $out/share/1password/op + + # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051 + makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \ + --argv0 op \ + --add-flags $out/share/1password/op + ''; + + meta = with stdenv.lib; { + description = "1Password command-line tool"; + homepage = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"; + maintainers = with maintainers; [ joelburget ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 4a10d68ee4dc714cf5b42d21205fd98cb330eec0..e565b51cf509135045bbac5a1760b7dbfc0533d1 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,4 +1,5 @@ { stdenv, + lib, fetchgit, rustPlatform, cmake, @@ -14,7 +15,15 @@ libXi, libXrandr, libGL, - xclip }: + xclip, + # Darwin Frameworks + AppKit, + CoreFoundation, + CoreGraphics, + CoreServices, + CoreText, + Foundation, + OpenGL }: with rustPlatform; @@ -30,20 +39,29 @@ let libGL libXi ]; + darwinFrameworks = [ + AppKit + CoreFoundation + CoreGraphics + CoreServices + CoreText + Foundation + OpenGL + ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2018-04-16"; + version = "2018-05-09"; # At the moment we cannot handle git dependencies in buildRustPackage. # This fork only replaces rust-fontconfig/libfontconfig with a git submodules. src = fetchgit { url = https://github.com/Mic92/alacritty.git; rev = "rev-${version}"; - sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx"; + sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz"; fetchSubmodules = true; }; - cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p"; + cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym"; nativeBuildInputs = [ cmake @@ -51,20 +69,28 @@ in buildRustPackage rec { pkgconfig ]; - buildInputs = rpathLibs; + buildInputs = rpathLibs + ++ lib.optionals stdenv.isDarwin darwinFrameworks; postPatch = '' substituteInPlace copypasta/src/x11.rs \ --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\) ''; + postBuild = lib.optionalString stdenv.isDarwin "make app"; + installPhase = '' runHook preInstall install -D target/release/alacritty $out/bin/alacritty - patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + '' + (if stdenv.isDarwin then '' + mkdir $out/Applications + cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app + '' else '' install -D Alacritty.desktop $out/share/applications/alacritty.desktop + patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + '') + '' runHook postInstall ''; @@ -76,6 +102,5 @@ in buildRustPackage rec { homepage = https://github.com/jwilm/alacritty; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ mic92 ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix new file mode 100644 index 0000000000000000000000000000000000000000..710ddfec994247c69af46402e97c5ab2492553fc --- /dev/null +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -0,0 +1,8 @@ +{ stdenv, attemptoClex, callPackage }: + +callPackage ./. { + pname = "ape-clex"; + lexicon = "${attemptoClex}/clex_lexicon.pl"; + description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; + license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; +} diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix new file mode 100644 index 0000000000000000000000000000000000000000..37d140e19ba309c8337c9d0ee56915fea896b9a8 --- /dev/null +++ b/pkgs/applications/misc/ape/clex.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "attempto-clex-${version}"; + version = "5133afe"; + + src = fetchFromGitHub { + owner = "Attempto"; + repo = "Clex"; + rev = version; + sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp"; + }; + + installPhase = '' + mkdir -p $out + cp clex_lexicon.pl $out + ''; + + meta = with stdenv.lib; { + description = "Large lexicon for APE (~100,000 entries)"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ yrashk ]; + }; +} diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e78ba2df9993d0a6914e917ad6bbacc8adfb4cf6 --- /dev/null +++ b/pkgs/applications/misc/ape/default.nix @@ -0,0 +1,45 @@ +{ stdenv, swiProlog, makeWrapper, + fetchFromGitHub, + lexicon ? "lexicon/clex_lexicon.pl", + pname ? "ape", + description ? "Parser for Attempto Controlled English (ACE)", + license ? with stdenv.lib; licenses.lgpl3 + }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "6.7-131003"; + + buildInputs = [ swiProlog makeWrapper ]; + + src = fetchFromGitHub { + owner = "Attempto"; + repo = "APE"; + rev = version; + sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx"; + }; + + patchPhase = '' + # We move the file first to avoid "same file" error in the default case + cp ${lexicon} new_lexicon.pl + rm lexicon/clex_lexicon.pl + cp new_lexicon.pl lexicon/clex_lexicon.pl + ''; + + buildPhase = '' + make build + ''; + + installPhase = '' + mkdir -p $out/bin + cp ape.exe $out + makeWrapper $out/ape.exe $out/bin/ape --add-flags ace + ''; + + meta = with stdenv.lib; { + description = description; + license = license; + platforms = platforms.unix; + maintainers = with maintainers; [ yrashk ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 479aa26a19ea61e591174b5102c5cf9fb765f848..3c1f426fb1b62d714e0ede7c86d916f63cc34382 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.22.1"; + version = "3.23.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1nd8pbcfpfw9b26511mhvsvjyfmgnfpdmzwhi7wpkx36wpa4sask"; + sha256 = "0ds3i3dhkgpwa3c1lcq4zjmiaza8k9and0lbqqw4i6jrnpk691f9"; }; patches = [ diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index b8fc63c2c9ed06325aabe6b3d5588989307bf196..90d7ecd082c89cbbfa57dd7dba0077a74d1a4aaa 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180412"; + version = "20180519"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9"; + sha256 = "1sb4cw95lcj2cdfzzgnwjgmnpk2nqjys4am5qvj4pnh0x447sznv"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index edc1497294fc3dafc69185f29801f16e7cedb9a7..23b98200d142e5a0f2cd090feb2865366d0ab09c 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.4"; + version = "5.0.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3"; + url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "1rcskrv8d3rjcfcn1sxzcaxnvmzgdsbjc9m11li8i4rln712ysza"; }; installPhase = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://dbeaver.jkiss.org; + homepage = https://dbeaver.io/; description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; longDescription = '' Free multi-platform database tool for developers, SQL programmers, database diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 9906b1fd8587a6c833fef2b2db21ec720797d9b3..1a809307cc12b5cb92b827634430c3475ef236de 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub, makeWrapper , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg @@ -6,16 +6,16 @@ stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz"; + sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514"; }; - nativeBuildInputs = [ perl pkgconfig which systemd ]; + nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk_pixbuf glib libX11 libXScrnSaver @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" ]; + postInstall = '' + wrapProgram $out/bin/dunst \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + meta = with stdenv.lib; { description = "Lightweight and customizable notification daemon"; homepage = https://dunst-project.org/; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index f8ba66c4197c23fed590f05debfc7d64611c746f..c77f8658220b24df387905897e02114968245372 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 -, zlib, fontconfig, dpkg }: +, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }: let arch = @@ -11,6 +11,7 @@ let if arch == "amd64" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; + version = "7.1.8.3036"; fullPath = stdenv.lib.makeLibraryPath [ glibc glib @@ -28,21 +29,26 @@ let freetype libXext libX11 - qt4 zlib fontconfig + libproxy + libxml2 + gstreamer + dbus + gst_all_1.gstreamer + gst_all_1.gst-plugins-base ]; in stdenv.mkDerivation rec { - version = "7.1.4.1529"; name = "googleearth-${version}"; - src = fetchurl { - url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb"; + url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb"; inherit sha256; }; - phases = "unpackPhase installPhase"; + phases = [ "unpackPhase" "installPhase" "checkPhase" ]; + + doCheck = true; buildInputs = [ dpkg ]; @@ -55,25 +61,37 @@ stdenv.mkDerivation rec { mv usr/* $out/ rmdir usr mv * $out/ - rm $out/bin/google-earth $out/opt/google/earth/free/google-earth - ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth + rm $out/bin/google-earth $out/opt/google/earth/free/googleearth + # patch and link googleearth binary + ln -s $out/opt/google/earth/free/googleearth-bin $out/bin/googleearth patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${fullPath}:\$ORIGIN" \ $out/opt/google/earth/free/googleearth-bin + # patch and link gpsbabel binary + ln -s $out/opt/google/earth/free/gpsbabel $out/bin/gpsbabel + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${fullPath}:\$ORIGIN" \ + $out/opt/google/earth/free/gpsbabel + + # patch libraries for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done ''; + checkPhase = '' + $out/bin/gpsbabel -V > /dev/null + ''; + dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A world sphere viewer"; homepage = http://earth.google.com; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.unfree; + maintainers = with maintainers; [ markus1189 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index a51ec8c1b044f0cf60542d9a4d0806faf0b4c67d..b6391d06eb922378b511d8edb9f6d6e1688e375a 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,16 +1,15 @@ -{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.6"; + version = "19"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q"; + sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; - phases = [ "installPhase" ]; - + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre8 ]; desktopItem = makeDesktopItem { @@ -23,15 +22,11 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;"; }; - installPhase = '' + buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - cat > $out/bin/gpsprune < libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.11.4"; + version = "2.11.5"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm"; + sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index b13e7ae5232c03e643ace59839726964e8b35ab9..036cb104b4805f761764e57058e9c14d67ed3e86 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation { Xaw3d ghostscriptX perl - ] ++ stdenv.lib.optionals stdenv.isDarwin [ pkgconfig + ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 097386547f57082de07ed0cca45cc891eed48088..b92012a29ddb3e535f448bfd455bcabdd9a5e6a4 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" - "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ libGLU + libGL xorg.libXmu xorg.libXi xorg.libXext @@ -29,11 +29,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "16.5.405"; + version = "16.5.439"; name = "houdini-runtime-${version}"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6"; + sha256 = "7e483072a0e6e751a93f2a2f968cccb2d95559c61106ffeb344c95975704321b"; message = '' This nix expression requires that ${name} is already part of the store. Download it from https://sidefx.com and add it to the nix store with: diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index db50b0d2169a027edfc4e2a892cbe44b38a84282..026cf9ecc14a05aca630a0e2a72388bf1aee33f5 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hstr-${version}"; - version = "1.24"; + version = "1.25"; src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x"; + sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index f984cb712c7a002ff7baad2e8a4f0b93f7372369..e4e45dd570bf6f3ea66f6063dda9faf248b40453 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.36.1"; + version = "0.40.3"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z"; + sha256 = "08d4y6x19cd4qy9pf80zrqarcyarbzxph0yp8mfb1sp2bvq42308"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index cf55ef4b64b259843b9a0f8e2183c55d57d7d15d..a99eb563dc277467d512408fa8f21ae58d5ec253 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969"; - sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f"; + rev = "975f53781597ed779763b7b65566e74c4004d8de"; + sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l"; }; } { @@ -32,8 +32,17 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "df4ec264daccb2ecb17bde9134830100701199c5"; - sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd"; + rev = "222a1f0fc811afd47471d4a4e32f3aa09b6f9cdf"; + sha256 = "090yb9f9gld4l0r6x8y2a6a3ghiqbyh19fgmjcjfq8qlv0vj5n4s"; + }; + } + { + goPackagePath = "github.com/bep/debounce"; + fetch = { + type = "git"; + url = "https://github.com/bep/debounce"; + rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"; + sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; }; } { @@ -41,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/bep/gitmap"; - rev = "de8030ebafb76c6e84d50ee6d143382637c00598"; - sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami"; + rev = "012701e8669671499fc43e9792335a1dcbfe2afb"; + sha256 = "10ixv4zwmrpxvpchws78yzsjvw1zplljw3iqvwpina2mkwwp71ql"; }; } { @@ -77,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283"; - sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll"; + rev = "bbcee2f5c9d5e94ca42c8b50ec847fec64a6c134"; + sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8"; }; } { @@ -113,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gobuffalo/envy"; - rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d"; - sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax"; + rev = "ef60bfc50c8f92d1ee64674d8ce7a48f1f67625e"; + sha256 = "15qrmw3l2achpd3hz8fkkz7yzpbvldm1pf1vsr250q24nsh6x7iz"; }; } { @@ -122,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b"; - sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs"; + rev = "f00a7392b43971b2fdb562418faab1f18da2067a"; + sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29"; }; } { @@ -131,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9"; - sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq"; + rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785"; + sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy"; }; } { @@ -158,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; - sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; }; } { @@ -176,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/joho/godotenv"; - rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c"; - sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f"; + rev = "1709ab122c988931ad53508747b3c061400c2984"; + sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif"; }; } { @@ -203,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923"; - sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj"; + rev = "fbc6b23ce49e2578f572d2e72bb72fa03c7145de"; + sha256 = "10rf7kfqnic8x4z8c29whb76w9v847y63wh5b2kfx6rqhrjfilis"; }; } { @@ -212,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } { @@ -225,15 +234,6 @@ sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; }; } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { @@ -248,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/muesli/smartcrop"; - rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f"; - sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar"; + rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"; + sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "ec04da47793482067e2e376d810e1622277368e4"; - sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr"; + rev = "8c6996ea1058153460146b16c341a4ae611f7cf7"; + sha256 = "1k8ai8mdi5cqbcxihzx727z3gg46lpkw0s1byb3lrdnmp31l7p9r"; }; } { @@ -266,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/olekukonko/tablewriter"; - rev = "b8a9be070da40449e501c3c4730a889e42d87a9e"; - sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7"; + rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279"; + sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; }; } { @@ -275,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"; + sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15"; }; } { @@ -284,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; - sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; + rev = "11635eb403ff09dbc3a6b5a007ab5ab09151c229"; + sha256 = "14j8ibm6h9rydiwfp9b5c7rwhnx04yqyxv1a7p7rmfwyg4zd714n"; }; } { @@ -302,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163"; - sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l"; + rev = "63644898a8da0bc22138abf860edaf5277b6102e"; + sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; }; } { @@ -320,8 +320,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b"; - sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn"; + rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; }; } { @@ -356,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73"; - sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; }; } { @@ -365,8 +365,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"; - sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc"; + rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; + sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; }; } { @@ -383,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"; - sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s"; + rev = "f315e440302883054d0c2bd85486878cb4f8572c"; + sha256 = "010pc6qjppqd9c7rramiwz7myvip9vhridfxy7wc2qj1kr92b4dc"; }; } { @@ -392,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; - sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + rev = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd"; + sha256 = "1mvnpln6vm0y1i5bb0ycswds49hyapg3jz643lmlw6d183jdcg0q"; }; } { @@ -401,8 +401,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; - sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; + rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } { @@ -410,8 +410,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; - sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; + rev = "64746a42f36bf0832f86b76004f1699dbeb33e4f"; + sha256 = "1hbk7cnbywiwxdzbx7lqw6iym9dpwvdyacg06gchxpfw7nfa9r27"; }; } { @@ -419,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e"; - sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry"; + rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f"; + sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr"; }; } { @@ -428,8 +428,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index a0b1916fb181ee28bc825a18c683b7ebf18c0a8f..3cead5d24ad226d6bb2c09e1f95de9552f834214 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -13,17 +13,17 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.6) + eventmachine (1.2.7) ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.2) + html-pipeline (2.8.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.1) + jekyll (3.8.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index c93f93f457dbef854734f34b66ac55410323c818..e96438eefe3a53daea9adebe09db37ad6a27f72a 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -45,10 +45,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; ffi = { source = { @@ -78,10 +78,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp"; + sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf"; type = "gem"; }; - version = "2.7.2"; + version = "2.8.0"; }; "http_parser.rb" = { source = { @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6"; + sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8"; type = "gem"; }; - version = "3.8.1"; + version = "3.8.2"; }; jekyll-avatar = { dependencies = ["jekyll"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index bbcdad669da18649d3ba3062405fd2e7e1d74d49..323a0c2f360128883f8194ec9b3d82f272c40f91 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -20,21 +20,21 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.6) + eventmachine (1.2.7) execjs (2.7.0) - faraday (0.15.0) + faraday (0.15.1) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) ffi (1.9.23) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.7.2) + html-pipeline (2.8.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.1) + jekyll (3.8.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -92,7 +92,7 @@ GEM multipart-post (2.0.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - octokit (4.8.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.1) forwardable-extended (~> 2.6) @@ -103,7 +103,7 @@ GEM rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rdiscount (2.2.0.1) - rdoc (6.0.3) + rdoc (6.0.4) redcarpet (3.4.0) rouge (3.1.1) ruby_dep (1.5.0) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 8473cee0be530829ed5fddab415060c4eecbe779..7fc93589236f67c84b44abf2ae89a98c772c0eaa 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -79,10 +79,10 @@ eventmachine = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0"; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; execjs = { source = { @@ -96,10 +96,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa"; + sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx"; type = "gem"; }; - version = "0.15.0"; + version = "0.15.1"; }; fast-stemmer = { source = { @@ -137,10 +137,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp"; + sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf"; type = "gem"; }; - version = "2.7.2"; + version = "2.8.0"; }; "http_parser.rb" = { source = { @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6"; + sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8"; type = "gem"; }; - version = "3.8.1"; + version = "3.8.2"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -379,10 +379,10 @@ dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; + sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; type = "gem"; }; - version = "4.8.0"; + version = "4.9.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -438,10 +438,10 @@ rdoc = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a"; + sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.4"; }; redcarpet = { source = { diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 5e492fc621fef38a7e686ecb770630278a3b7fac..53b965a1bb70252c72fb85952d86357371e30ed8 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.38"; + version = "2.39.1"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; + sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 0e1aecaab1d19d694a2fdfc36db5d238dc4e4f2d..6b37f9b9145d9570b46c8abb40a5929cd067d355 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -26,13 +26,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassxc-${version}"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87"; + sha256 = "08cj1nxbjy2m80h3irnra2qha7fc5ahhzcgkyk9jv4zyys9xv998"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 496353325255fd16fae3b539c6a6749c82d61ad3..e9c860f0b90179054a148fcc473b3b2326a83b08 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.9.0"; + version = "0.9.1"; name = "kitty-${version}"; format = "other"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8"; + sha256 = "08j2k3852c64z4mgh1j0dgdj6c2alkckpav67lzg1lxsz3w2izh2"; }; buildInputs = [ diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index bcf351ff46ae9b415f0ae1981ed46d0ffe368640..6dc448c6bf48c02fc23810adb66d86c80b24059a 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -6,13 +6,13 @@ let pname = "krusader"; - version = "2.6.0"; + version = "2.7.0"; in mkDerivation rec { name = "krusader-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh"; + sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb"; }; meta = with lib; { diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4599fab0c6d6e6654f67aa4c0e810ff625428bca --- /dev/null +++ b/pkgs/applications/misc/limesuite/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake +, sqlite, wxGTK30, libusb1, soapysdr +, mesa_glu, libX11, gnuplot, fltk +} : + +let + version = "18.04.1"; + +in stdenv.mkDerivation { + name = "limesuite-${version}"; + + src = fetchFromGitHub { + owner = "myriadrf"; + repo = "LimeSuite"; + rev = "v${version}"; + sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libusb1 + sqlite + wxGTK30 + fltk + gnuplot + libusb1 + soapysdr + mesa_glu + libX11 + ]; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d + + mkdir -p $out/share/limesuite + cp bin/Release/lms7suite_mcu/* $out/share/limesuite + + cp bin/dualRXTX $out/bin + cp bin/basicRX $out/bin + cp bin/singleRX $out/bin + ''; + + meta = with stdenv.lib; { + description = "Driver and GUI for LMS7002M-based SDR platforms"; + homepage = https://github.com/myriadrf/LimeSuite; + license = licenses.asl20; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 4fa3b4ee43535e28161dbb878a8d4f74f7f3239d..b6ec3305cb3a2e7e4ee75fc0e69d1e7b7febc66a 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "18.03.1"; + version = "18.05"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; + sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index dcc2a1bf43ce3ef10839b1000097d890fd7533b9..5b2f8125f72c622b72dffc80aea09b1b17880103 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.03.1"; + version = "18.05"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; + sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..02541842c36e7835cda5523139bebcbfb91a6033 --- /dev/null +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -0,0 +1,59 @@ +{ lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }: +python36Packages.buildPythonApplication rec { + pname = "multibootusb"; + name = "${pname}-${version}"; + version = "9.2.0"; + + buildInputs = [ + python36Packages.dbus-python + python36Packages.pyqt5 + python36Packages.pytest-shutil + python36Packages.python + python36Packages.pyudev + python36Packages.six + libxcb + mtools + p7zip + parted + procps + qt5.full + utillinux + ]; + + src = fetchFromGitHub { + owner = "mbusb"; + repo = pname; + rev = "v${version}"; + + sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3"; + }; + + # Skip the fixup stage where stuff is shrinked (can't shrink text files) + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + share="$out/share/${pname}" + mkdir -p "$share" + cp -r data "$share/data" + cp -r scripts "$share/scripts" + cp "${pname}" "$share/${pname}" + + mkdir "$out/bin" + cat > "$out/bin/${pname}" < $out/share/man/man1/vcal.1 + + runHook postInstall + ''; + + # There are no tests + doCheck = false; + + meta = with lib; { + description = "Parser for VCalendar and ICalendar files, usable from the command line"; + homepage = http://waynemorrison.com/software/; + license = licenses.unfree; # "These are made publicly available for personal use." + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index d705de1a8cd6ca44190581789f39bb8554f57809..143ec518ac51944babca39c6f586a416f6422808 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, libusb, fftwSinglePrec }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let version = "1.0-rc2"; @@ -28,10 +28,11 @@ in stdenv.mkDerivation { qtquickcontrols qtquickcontrols2 rtl-sdr + soapysdr-with-plugins ]; cmakeFlags = [ - "-DRTLSDR=true" + "-DRTLSDR=true" "-DSOAPYSDR=true" ]; enableParallelBuilding = true; @@ -41,7 +42,6 @@ in stdenv.mkDerivation { homepage = http://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; - } diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 968539336a9cb5cce992eac97001931ad3a140c4..bfb43d3e49d10832a651b58e04aad816cb8171d1 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "worker-${version}"; - version = "3.15.0"; + version = "3.15.1"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; - sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8"; + sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 88adbfff3b9ae83bacde420248912d9828398a85..91fdb37432eaefcee8c0103cf6129a650ab7b1c0 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.3"; + version = "2.6.2"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp"; + sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx"; }; nativeBuildInputs = [ cmake ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index bcaf89797b446a119e6e8631042c578581f7e0d5..8b15b0307897cdc6e03cb50caec3668ec273aa8d 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-332"; + name = "xterm-333"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx"; + sha256 = "0y7gl26mxw6kwqx9j9mi6lx1lp1v3nrlga19ddn07j2m9q0l479g"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f0862aebafe522c516ee3a8e63c121a6ad19cf95..cb2121553ace26acdfd32119ef4519b7768eedb6 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh"; + sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7be5d2591150e268b0bdaef2c5546aaac16bea08..bb080a50bebddc1e7ae4fd00432e02dc7576e203 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n"; - sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n"; - version = "67.0.3396.18"; + sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny"; + sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf"; + version = "67.0.3396.40"; }; dev = { - sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f"; - sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j"; - version = "68.0.3409.2"; + sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp"; + sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w"; + version = "68.0.3423.2"; }; stable = { - sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy"; - sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0"; - version = "66.0.3359.139"; + sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip"; + sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2"; + version = "66.0.3359.181"; }; } diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index de56a0605b86277a0be15790a00f0bafd21af9b8..9dad2df7fd0a984fa56b849b6b192d6dc9a7da05 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "falkon-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna"; + sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41"; }; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d8afbf9aa193a969b30ad9553b4d11f94e26d954..47f3ac7446d012aa846dd99f10f1963c97bd342d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0b8"; + version = "61.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f45033523be148f3cf43d800ec7186791045104eba8c6eb10bb427a5048e826152c4d129bf97a4efda41281b5854643f239b9a124b488740c1cd2bc55acb2504"; + sha512 = "0b1df338f80f20b8d42b9bb541ba877e783c4a23589a68f9f1817d26201b84f3387eb01980add5d4efd8ba984e3e742e7b2dd049a45a7555f01fc81ab2cd429f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8d4ca433ad148cd3ac62cb142009a64c8aa09e49d04a060040d42c9e5720ec3619f1896a7b2e91f9bc0f4a78be0dbfa30fef7f19c233b78228413335cbfc9a93"; + sha512 = "7c5cf4743a057ed08d5e998311f8c5995eff36e23a047ac580a16dbdc09f92c503e7751580d2c28dd80629c3430f227992ccd8144901addbd6c1fe42264f04b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "16d132420f991376b3dc15d43f118aa12d1d617cadb65d16d645b1a82a65cc7a17a4fa36a03a4280a6e6c3d05d5f4c6d97d5f1df24fbb4d6420a16d271dffcd1"; + sha512 = "2e8783230b827a9c5e1c10ceec0f4a7c0cb5089814482f7700c700b18825a42df23433b6dd0c21608e4ca273d2dd0d1987722e470ae3915857338bedf252eab3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2a362ddb4a263a228b93494b8b39071b85cdf05264ef1541df5dd75a84f7d7391b0d68c19e76ee68fb0a4cab7e4de6c1b39d2f97f8f16e6d7c06ad1b630562c8"; + sha512 = "95b2c08a8f8656348328c539df04bc048aabf2148a10bde67c2672d837d5983b2f370fcb47f865fb744a7e2e592d60acce159e280321c065fa224fb0d4ba2583"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b9172bb80eec38221065e89e0e244c1a93f52e2a5754c0b0d93e78b338783188460fdb4aad13eb69a205f7af1b831451f07b19a9633ab1737e1d48e88108647c"; + sha512 = "4b1d0917208a0c7ff11535054a6aed42766a8daf92a044d061e370b127c86d4f65ccb88f371b6529762906af5174e0852663b4070e95842e238090b52e42e693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c1b665bf08317624aec791a4cf97a240c8bd192f28b31a3a4283846628216bb98b60b50a44d7a14b37b0339fa7cf51af9f3a47cc1ced764f560567eb19c31d56"; + sha512 = "f74c8fea0b1d35fce816db8a4735feddffedcf428b712da2c3044dc060c0b474d909a230350f1277f03adf836d04fc18b32f173e0970d30638890b5d59db5170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "fefa5958fd2bd47125b5a8601fbd0834b6498a4ef4b38c73246575b090b94981d39f086534fa5844432554134f590ef28fd9ba0a9e656a4be16c82e4dc368f75"; + sha512 = "59b418da3bde6836bcf69cf7efdd8f11752faffee2e37fceba16016864e476220e98215eae485d9624bef07b40cdfd242efa42dba97ec3f4536c5f9305c9e4ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "3ad059b65ac9a5d6e8af9745df0ff35ecacdd0af756fc1d5a22a272fd94c49b163d62c7a59ba5cf485d860dfc096209ebd814673b909c047a5c0a8fe3b551701"; + sha512 = "115928b1c7281c8e3924053cdef5137398ad75903121ff5158827a1c133573bd2ead4095d9f5a1ca13a20b2423493d76e2ae24c10ec4ed35944f678f0a282f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "0eae9cbaba7eebe0fbbac423538afc7dbf439c55d1d29eea9f14468764febbb3f1141fde29642f485f5d7c690ac1ba3b91c9fa436f1cfa50fa87191f1b76d6d0"; + sha512 = "31b5a82661e47dc2aec8991ac34a0d265be74a9598fa3405d90b96b1b642819796de21cccaef44c11256d1c84b1bdbe83b35d820eaa9107ba53a7b55534e5d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "0c056092cac3a3660d8397a5f14f2ea0cfadf7253d23d97280d7ab3c6086ef1292bcd5cf42fcff3b1ac6bc55e98ba5aae707d5b205472bab9c37d4fc7869485d"; + sha512 = "95edc99dc2466159ec195f1669ff161200b2ab95a6f3aac748990b9ed03b08b51dbfc65381359ba8b4d82a73bd5de73dd29e3e096e92e20c401ec2e698d8c46d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f98a1efb8dc56319429a06e9b52d0431591ed70573c76e80a4b4c419c47a2d810ad9f3f9ea1c9a5457cd55e8f98155165b7922000d750033503eacab2e8b40bf"; + sha512 = "22ab9a5c9c7e207e5944bae42448e5fcab9c0266b4007af487671e52b6151a6e256449f59bcb43428f536fe520447cbf8e23e3ab998ce6f1bc9deab88bb4fd98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "475d9a65a6041570a4bed8c96e63aba067a7eb659a1f303b0ebf27e55478dbe3597ec7d968329f352498a58a5256b2fb36505e09e35d1af9ac1219adaf0e607a"; + sha512 = "ae5462ef188b7e9cdc79b879a84dd1993961ca14d88e6b06732725098ee97e0855636638ed1df9e4cb02844372aebab85c42d86ce89149ba629f2b2f8b1b99ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "ceea5a1b8fd3f8ef3d719acb62c5653ee00a3fdf7ffb2e81cfc22936aed53e726d447564a7173e53f27946f55d37816a7bb01abde95e8a6c1718d0f7cea35437"; + sha512 = "f99a2d3fd40182745c8e1c50ccb104084be8c567717c5b66bcbfb2fe1b8b4447f5467b4e60c87af58c82d49655cb79a05ad78ac86701a4ecf18beb39ce666598"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "97b687e518ea024c510365b18a220ff22fa0f722645c927519778bb8ccbce55b1bc3a909d4d06b3cfb1ed20b3dfa3761593b7967f516623b4ddc8b26e97359aa"; + sha512 = "497ee03f14cf80e9e34f54d64acc1889ab4bf510019c47b1508fc3ab72cd284c009d8d0739b2d3bba7d7cecf41ed67925641d81a34de867e8cb9262e3e12944d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6e846c894d67da44f5734f409b6822afc043bd02ac6bd3801daf47891fbb1b3bab10ded1f980f11c7f41a8ce4d59b6d99b20eecc33fb60d189cc15df9bfd63f4"; + sha512 = "41ba583d7dc03a87123b0246f1d3ae2698af85969f362e73e3530b1704795a6566bc688e8387a5427a9d6321d30c06fba45f560c19ab05277755c802d4a12174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4c647b30775cd27e6955e8ebc4e9b375283ecf0b068fc7a49d3a3f99212a8f318a83879f975d85c6c83a88735e9851296869374edcb43dcaa167c2b954edf939"; + sha512 = "88fdd62fc0ce35959f23fcdd9c1daaf25860e91618946d222a94cd1586c833761871014973d0a9320c9612455d007cfd4f0e01e2a0cad11401e0738e101c61cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f1d742720553ce31bef0881fe5da8c20d5bb2ca99710a882c8805b26c35e2677653ad2d4ec91371dc724410d0edeb884813f8d88ceb0f9019963cc98121e6bb2"; + sha512 = "c5eb2ce849ef8058a068c34936f35cfde321b53d416d255df2d0f1813f26a6c57abdb718d4162325b869a9155b360d0c5fc32abc391bde3cede2c0ec8173abe4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "ff07e1c11f23091084361ff20404cd154e89d483b98b3d960b2e72567adf66192debe1862c1dd461477469d8c6b07a02a6dfbb9f0ff644c6743380159df5fe30"; + sha512 = "6aa5790414c918b6f97b1b99d6d5cfa59ff4d619d0d8fc38d95de201f82897fa5d02bca3be86fd535ee2eaace5cc5f458a6289d416dbc2266c61ff2eebc84004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2338b344b5507478c36f900f76e264580ed7f62e46d042252ea90251c1c80a9262746dfe7d40c6bb593de89737c848527fe33d555dd7aa7fa3971fd0d4483e9a"; + sha512 = "62e54d82a20c33e551d7fef97ae615833937515f362c5c74a2ac9f88e254f8f217f38717cdbb9fd827f882b2e2a75ece61c2217b62d593fb9e93e8fdf05786c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "72cbf626c69a54d18d8c63895e59c2464e7e2f9e0c6f78e58548a8f861e7b2033533c3569ddc2ec3a2e4fe54d0e064a855a23485a68c08e1ea672e2499183258"; + sha512 = "0d8d7a77589be0eb1c14d9434acf5700aa1f4fb9349d1b20899774f5a65b8a7a32ff393ddc4caa42d6cb6ea8c063d8eb4650024dc7c2858feeb6b01f613bca60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ee3ba405eeb7ee4d0622af5ed377e39ee4049b33637d122b1395cb00a9db8558454d8d371ee16ced37e1a9f5df7c07b8df5c0db67822117287c58a7b08d45fc6"; + sha512 = "c1aada0c4ef3484285c233d5210097e26fd549f40addfdc2d953111b2c4d0e2f320ea3347d391a1a582d78fb798ab1809111c13e4187eec9741e49a034e5172d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "203e6881ebfe4e1c238b83ceee8e59666856640417dfb27478027ba204823f78400b03e7e060c8e070207654f522893c321a9efe3671a212fc3d93519bf6c960"; + sha512 = "f38b473313bd012cf4ed3b8ff327a59d10127816623ddcdf63083cc4132996300810a2c760eb2a8c2cb5d8519648a17b74790062ecd266e8e3e74619c781cf3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "51690eb72296dfe440216bcc85f31312da6c10feb251a94396944af3fcecefa9cc07a4a278775214df2841a3530575fd385ade2dacce18b33231ea7abbfadb75"; + sha512 = "abf8f44cb3c2713e1fb0e9abe41a45e67c270e653f5cf34e07f9692862f87d51140bc56ad757c6f4a440b0f03ed09f0b6105a13cc3b5fa97dda6f0302dd37889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "2c802cba2c2d9c6627136f83fa3bf31ac2a1da1a8803a0d816ebcb16ed36111ace5fd229617e88a9a6e25818dc350261650969f05f3b2c3e7bd252a0d29ee54f"; + sha512 = "4c953abd9000e7165ba5402ac52319862c228a2d58ce422295166a8e10100731a9a8887d989c2eacac416cfc655e18ec8c6ff49d6f34345fcae32eac7347e9ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "407f5e44710733635f1508ac205186a182891415615be886da185b856903fd3c5d4b61c55c89f4d9a5ddc5e275918dc9e2881a2d3c1b5f038e1d7f7d490334d2"; + sha512 = "a104015a1517025a186d25aeb62aada054d53fc4a84836a0292be13f158bec83adb33cd52576e4562a871330c8d42d12a451d6472d77edcc46b074f336480180"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f6d00c92c423e09c61f23ce9c743c91efbc4f24a140d136f0b567fae3ecb45168eaf3ad5d886a1f15bf269c63cf8d8ed4f35468fb887371610ef55ea71322a62"; + sha512 = "aa8955c97e9cf58d1e39798da746616e33d7dc9c1447c1c1fa222d0906d891fc6b44ce0cc8d29408a12b24f0829ccb39d01a4a8895b1c0117b86adb8411cabbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4f8fe24bbda036402225b42b27bb48b46166bd9fe1963f0c802ecba2f186bc72c300d59e10a0fae384448ee2374ae88f311606d69b939669441c33dbde352795"; + sha512 = "e3ef1125278d00395357d1b15c081938c618ef8f281021d26dfa973ea6b9ad0cd2b170416739a501b9e07ae51e8b33b5ff501f62573bef3471cc34fe5419cf8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e3051d9beb78b3ff9fc2ea969ea9e8b672b03162f94a5cd290c8953c08f106d4bf141b749f3ea8c2d38a2d4711d3585fd0a358a45862b4968f6b1a1b38bccee9"; + sha512 = "c8ab8eab63c349e8849039307b86e7ae745319bf06c9c1553864eea078be2f4bf9f241872224e2aca2077c7d279daedc70d75da2214adf6503515accf4f091cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "a1b7c28fde683783d5e36ade55ae051bddfdb829f6568a0ede19d038ad9e5cf25fce0e5669d7fee50cecd8b476dc9f0d4d401c9d6b30f2c4589bb086731fc5b6"; + sha512 = "3fc3ae2234cd2059a7a2b33069e3e0e15d8ccaf8fb64ce504a74c414c4054904ead632d5b9fbdc20768eb9d73082da0db8234c7216b788fc704d8a8e7bb6d621"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "70f839dca4b337a3161b71ae8e2007e8075a0b8fbb1b17ccc0e78c9e1f34e50b5711e5678f183cb3fb14fb6b961fad82fbe32393f15c1476e57ecdf58881d1d6"; + sha512 = "7dea5c3f7f66f549e3365bd1f2b63f12dc8e36e5272b184c49f5ba38dc93d838a361c84e25cd03faa50ae08233b49ee3389ba961ca2352a74fc879a4e39320bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e242ec15f4b6d136d9018df3edebc2eb94ab9e02f0ec1737e10ad3f17a2c24696a0cc2d0314e3b09e07d979a2f0fbaed5a8ac10b9954d5c54cac0dd0a2b01ae4"; + sha512 = "de4775a4ee4269bcf1b1c8efc4fdf9fa3f987b84d899dbac36c25ada1813a35ed4f1a7e20bf11f7933156711405847bc5ae333770eff8a02623b1ee5457632a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4fb727e5d8b8c3519fba218a8d4bd49a58ea4d7c20f3143b183fb6ab5d1b17cb373933da645c5d3856906a97bfe6648964495ff7a85bb85e01938abf79139f45"; + sha512 = "00242ae07a7ca996157abdbc859539441d2067b90c1854a316e4d6b81f4245aa3a93078bad667073e5d1164e690bddecb03074b4ee9b9fd6f2366d141cc6c4fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ee25d95b8f9a5db60fa5adb7c656e8f39a1420b380ddabb3b39fa2a50322fa104934380b6698cd4f6d941d9b63e77a98e5cb002ba9dd3548111c9e6d6741f7b8"; + sha512 = "4e4de19fcd2a13a84820f8a69d591a3453ed8ec3ad27709528ee1ad0ad9961ea7a1f13a4633cf3ece10b927e0307b1916cd5a05d756f6b01d45bb1e9dc6cac1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5344184aee16ccdd0b8de303c788134b8435364a760c1ea0a706c44f36d344ca6b25dc5dc6821c84cdff2c5f0a8a7da8427ef4234d94d649e951c901200c087e"; + sha512 = "19af4c8cc8b453f883585ade2216b2c875085b7ccc0dde80e4014fa5fac5d9e4cc712b48d82b5124359f0fb2c8b0dcd23cdff29855ee2669da76aceff0464c77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "67f5f6d342262e8bd3eb9ac0561b7bbf170b3f8dbe861e8b9c0607b087410a24c1e4b453502f77eebb5a045d5980bc9e1680bb0c6585223d4aa809c872fb9d3c"; + sha512 = "fe5690978749cc755657baa6d0a729802ca16f0a0e2c3ac31e78f34bbb256ed081d18054fcd94b3aa5286e91098e5386fd96317f2ff70e7cc3b63984dcc97993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b4a3d6a3be694d00809de9d78a1b36958f9150714b8ec068fdf9e79982bff82d3dc7c54f9857812b2ea9b2708aa0290d4fdf787993697f99ff719b213e50b0f0"; + sha512 = "67e7af73ac99ac2b895d46976b5f94f0f8c6d0b89eadc284b995013a44f93baf7cf132fa0f66db7e6248c04538469d55f32220964931e1dc50ab480120e75f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "14411beefc9729e07b80f1f036ac651312fa4d257479882841f82b0c5c10ccfaf83f31b2597c9076dedd3af4dcdcd62ee660a38d48a864c09519bb1c75728e34"; + sha512 = "8b6b5fdd5d662f7794ae84847addd576ea74dbfe2ffad011df0b73ed1a58186138818e8d05833b01f58e408928b53140a8127b0fb35c7b35847f93e4b610b26f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a6e40bbcda17d41a9972e56794847fad10bdd14d3e09d9ceda82b09d0d8c65559667b69afa2807fb9ecd26b8daeebe29a8cef6975bfa9e769886bcb94526f14f"; + sha512 = "4c481d6b0dd51b391820ea937394c1527abc82107bfda98ef67952880702d317372d1369ce6f767f54dfcc4e3249bc190d23d8214148174370293125ae031cb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "39d93aad369a22207d052611355b8868159b8fcef54fb86bd7bb1323ffad34d90ddf870d4cf21fcd3db0418b7e12335043d683c5f533454e19201ba6b9090c77"; + sha512 = "aca1e148b4a4d5a7266d7d5eedb4a761b1e0c047eac2738a7bc28e45a083f59331c7d743bc97d92765140d41b06d3bed820bda668aaf7f8f8393a8c074269a3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "83f4351f9c7217aae381b2ba3ff8cd00d1e60ac0a05e87598633ebcf70804d8aa235f0b6af0f5218b90292970a5f18ba923a1a20b6343b3a8a5fb67195034d58"; + sha512 = "2043c6cd6d0de32bfc3fae90c5e311fcafe665c7c8036fba9d2265c6de54c0ea9c9238f61a03649c542f534782c12da475d8e3b32cb66c910ecce0ee9ede3762"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "82a3f443e757dfbe47cba8c6fd0099b55537eb290529a3d93569d7f044147e37518e6be82bfdf1b9bf13541615007c11d12ae7feea6c20c35e5cf74e00aac1d2"; + sha512 = "5237ecf68ff48ec33302459801d5fe1163980b525cc3fedb634831dfbf915b86df075e69cc86bf7c8f75d23c75e6b6c6b11cc7967494e99283714b421202cec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "71bea5afbb118e32e2e8c88f2eb88a044124068115301e1eccd892293fa59b2296d548cb662f6b67c6b52d8d9dcac6c7f395e70183c2881b72b7fd3fcf1fa759"; + sha512 = "278d86a5e44e74adef879f291427a5027ec8b4f90b55a108347b56ed340dd0bc12905acf903430bdee40ac1d0d75685c98efa2d6c26fe976f20548c6ca3ec8ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3cd583e0bf4d646fcea81b4c20a25731b9b69dacc61384e8aca6bbb3e1cbd795e31ff980f4079a51ce76f71d84c5cc6a3e486ff23f1ef2447d249aba48af9434"; + sha512 = "e94e4c9afaace5231fb0817887c9fda25ea08547f262337ef7b335a58ea16478f213e737a1379b1d8be5411f9036f787b8e3cdfde67fadd6623edc7444832c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "79393657fda529897b2f13e842f44f1bb76b2f90889bc86511a23238fe930eaa8abb55eb5541640fb214119ee2e0472b3688e75bd5f00c87f5b47b193bce8e70"; + sha512 = "1cda9bf9a20e69a988519fa06e6bab8384f33389ee1e725b561335f9544d3d107ab43789700d88f606c3f92747857ec46510cb1942b644cf3daf40201381c275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b391dd863b6d336cc6c9c60c287e9f85f73c91cdc8463f1b3ded0239953ff7e0bf04cd8daf12185277175a71b55ba002ec74cc1256882e453fede8034c9a9a34"; + sha512 = "a92604b7cb484d425d4bb40feab69b75034002c4a38d4191768d025d07ab91ed6fce1b2c4edcf0db3ce0a8c3c5bca378def024f8f960d14c08662d16176895af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ecc51ff78e3343c72bd1337a025ffe81fbd62e98bf1028f892ef59591a3893bf99bc0f58dec5e183672c6ff9a7fe36ab140a8dbfd892bcb99206b7683b7f7189"; + sha512 = "ad8e9acddc4b9ded3464f6b25391094a31036fb1133f9a1c31380d6f2f45ed222cd640f15f07a0159bd508208e58c70d493f73541575361482e91e243bd405a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "e0fe7721850ce3dc21aa5fb587e205d3833fcbf1b513df3fe67e9e3326ed57411920c6ba7d8872bd92a5df073362f67b101ae865e0954731549c7b25cc34400e"; + sha512 = "8871693fa031d1616dd036566c89d8ef8f0e6f14982b915697596159212f111cb285c45e9d0a27ea85cdd68c202e258e03da8d1e7d7d5d299fce5639202e6b91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fa1f58e589f1d5453e8b349f87bd798a0b7fbf396890b6531c433fd27043d3a599f218093398de09387b2bd1d98ab50e92bed3c211617cfea700bafa0c846f80"; + sha512 = "d2186919c346e057cf1df9a0068799200e849f9435f710c78ee396cbb5190e7993a2975d011840ab3ab4405bb9ab367184d896417abe217227acd8dfe8f21dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "73a0214561b02b4b30e495c5e62c1883409cc20b8f26c7aaa2bc32edbe197e8aed2e4165122ae84dd3035d36296d91a30c4460e9a5a319fb222f0d813601486b"; + sha512 = "fb9a961533da35e0a06ecedbda83e62aa1ec1aaa743ae683f7bde43f83b0631b15498c0e5fdb900f6fa8cd840d0a688317fe6577a435f0a4d445954f3be93d3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ff6d9319998a1c9d394fec7c484b96cda4a473e374b193b47de3c473ba91684000d5a909e5bc460b83fd92562e225476671d42781968051a9701a5e0f760a385"; + sha512 = "95adff7893359d470c0ef92773419f66692b89c883dd244c014049e6869472b2711ffd40f1967588d17f763a2148463883357c084a72b9a52410068e9a4e2ef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3b31ae6a9d84266007d7a61840782f3e1621a5d4b5dc05c7352e682132ede5225990712b4371edd59edd47004a87319e11c347b18a39e4477afc267186b2f1e7"; + sha512 = "fb73b5466b8a09dbc17e5b8bd4bb204fe449e5d49e5be2979eab0ced8f65d37db52a1c5acde742063322e214724f37ae36d236967fcce41d58037bf3fc9aeb33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d5342196a66b2feb19352b5792bea6579e1921b573d583ea8223a3ec1e7c59df375a3ebe83345330bf42e6a01c54a5947111d0951025f6c57e55bf374bec1c52"; + sha512 = "1578a5e7738cc2d85195e2474272ed68b6930020dd34e6ddb6ac00db682f138f8163a1fe0c5b2d179f3b5ae1781edab94dee4f6eae660c7b7a44123fa0a18202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "ab045e67a005d31da572c30c6a90266e82a892c3c99af55ba97de6dba0f2be029d58d6ea259ee13d63e15b27f124dac528879109ae4342dcbfb46eb376021846"; + sha512 = "c2548b1f0636928f594c228af277cae652f8436c22ac7cbb53da103ccf03b074f55427c366b4e6ee5799dd3b19e057694658051861cd5d29b2162e3101fcbb3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "aef5375d4d9ec0f34cc3417d68cfefd7f4ecb489a66bd668ce1bdad9ab804fea267557439bdab5d6685007a3d16cff85c9e92f7c1434e3a76bfcc94bea8353b7"; + sha512 = "04c08d0d88ff6b43bf5ba0825f68d1563dd3ca05f8ea7c4143d9a6a9b78a9d53f65cbd15330dc755587b4511f998a86bfa97b6903f6a5b2215f882ecee1a8969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d3c86d1afc103a1db53e1a03ae36f3c7da7a1dcddcb5ff9e2c8ec06ffe60a8e4f767a012e375191063f0c40a80bea08b66ab0a2db3ceccf796de15bcf232f04f"; + sha512 = "1eff82dfa45d685882364e10b4ddb869dbe6b3316ffb89961ed458e0e64023d546f2a6ae22a10480d27f941e059151592f3e1af79c946d639b68edc62b506ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "0effdf51a9ecb2312f34e14edcaa7ef40d392f6f969c46b1dc204471da276ba5b73416ede2cf6ea69205f67ef44df815e6038137c2400df2e2581564cde5b1b3"; + sha512 = "18623bd96501846a497f56813ae415f5858150b85a3a95c5c7d4cf3e645444aca6de32eb4a6624833a0f3677f11c0b3d4219114c8ce90a4087bc1da41eb9c59a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f57499563c17f119472fcb48afd54d4df98c85c854814f872e12e5ef4d3dac3192905f43453849ca7f024b4ae9a96528c2f9a55866133e3ba0651d046fc4ee8f"; + sha512 = "a859aa4c4c6b57ff2717104ad3add8ca04c7183db7ec94791c832ebf78f20fcebfe176a4d9a4cbc53e67a3f153350d91bb18d10299d3af0a590aa43766e37889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "50defae5a904a2dccfe8cd34aa2ddffa05a18a8b8b7181029f7b5b2a6bf612445bee2c3a4cb4c4f272bb97dfaaa487f2ed31dabf200631c53d963bc5f66fec1e"; + sha512 = "11c9ab7ad6e433e6e699a0aab1071cbc7b8f4e9a86452737b79a438c6440ce24e6f46b741c3c9785afa36ba85ba157c61d0a8377dc4de5be2e7b5872f4752fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9bee6742358a2c726b23e5c51d79fafa92ab8a3df7ac4acd2ebcf9b0d6a3661ee65d6335ec91b4e02a0f8cc3c3b452ff642ff2682788a647fc5d29c80b8a6d16"; + sha512 = "1eb96774418cedd2200bdab29b2496059e3a99390a4ebd9a6ab0cc862748a7c5d53a895e999adada1be40631a083ec96181397401cf38a642686f5eafaad240c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "1c2d6e3f62ff24b4590163da626a92e461b9e7035346309bc7cbf1185f21ce318ef6e072902249da5c59d1f37724e4079b1d673492d2dd94ba0f50c38af818a7"; + sha512 = "fbbbbb31452bed65635e3b76aa2a83338cee8a84eb372ce26b36824c207a02f646a8f7ff3b8efe83916857c579c65ba66a4bf8bb63e1df2a7d248af4788f8649"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "be9704ccfae945863ddd60ac9a4cf4bd2642bfb11fe3adc20d396c9fb0a85189fdd31200e59f06aa4a1c50f46c799ab07864e7f677bec2133b9e2e60ebe3175f"; + sha512 = "1f9bcb234b11fd5bc4558cd18f263964379c50459e2667894f797a488fdd474b2b86db9e332c8121a78ea7fca97f0b6aac9e0cd71756df4197291439ba8beb5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0bfb640ce98b3e16b01b12db7c28753d9d90d46beb7ca7f205fcfb9d90537eeeab6b29ee999108e549b257c26ec4e13d64e470ab79531f83895403ca7ebe7d0c"; + sha512 = "babad97e5f7430701b38d8b592b11e3e31c6cd5877531a612d41e8b33221c9747a0b462fe938e0a724d460a60ffd4ae42107a78cbd184aa5b22a3b1fc86fb449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7f8ee664f3f4f91c3b13f2e9f0cfc8d575f9a0da263370b0575a16e6e9bc7ba9e449f62df6494ee9837fd8e4620c2d4848d0cb7d99a3cd675a87bd65c1ae96e4"; + sha512 = "9a3e12e9c3e871204de6ec6470c7daf9460a0a412799f5451a78001ee8af0bed3f1ac96b52dadbdb5ef63fd1355baae0adb06115bcf826d0720dd816f755f01d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1161e096b7d01fa4de5ae618045cd0528715f961434eaa569f8492a7ef0c059c2369f2dca348ffe0f24376cf6ed529be9b7077bffada3b0812a4aaa6677a6c82"; + sha512 = "3f83993c15aefc974c246e00f750bd94d286f50393d2b3bfd6f3fb3a5f6c98f09265386d419cc1fc9c2ec62542fc1410eb8fb0ec66fa53cc9087ace482288389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cefca3f2f8c94cafea0e473a44a1068ab7a26956b9bf2eb3cd0dbdef851288df0bfc05ec0cfd6cd804963d1fbed7b5226cd1171d2fbe86372c977c22b162df4e"; + sha512 = "e730a4555cb72bf9e7fcbfdc7f8732f9f62ba0339c53f7c5efb4752a1d344ebc535dd4fb36147ad724a4dbc8dd7ec5aea63de72102c28d3e5f3741428884be53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7b6801cde7734c77318de91dfbfcb3e039012d048fd83014e66079d797a9d4b4c7394b7a39f330a24c82c0761436bfe6d7d5915e26e4ca18f4095fc68c728caa"; + sha512 = "93b41b7e5dfb769a61bc9051d4a86c94101d44ff905d16c6a4764b67813c047e57ce21d33c3e39732c9ce904f3fb1c3cb9d0e167c7531c99bfd525f3a2af65e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c4257963ea60c4d932326dc5fd468b96bfb6a35b35ef3c7950981ba92f6ba07dda586177ebfe20c386fb8b61d0ad406e102163f43a2f96e9710a4b0e7c241245"; + sha512 = "6cd4725b388550bc37b661e900dff1535db40f264884666e497ba480d88e1cf28ae1b2ee67b806d95c4fbad53dd3978f468688e6dc86b2de7a52cd1fbc9c0682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "6061bc7c8c0fea22bcaadebd2a264f0726b43c71b9f4b8c4b33ded9dea7ce9765e88fd1e4dd47935ceb5791a43785db5f4381fd2bd0181a281e62b6de025ef13"; + sha512 = "2caea694cc0c5b2405c8e135895a13daa454008f1731ffbe88051c738a9529c627f4ada3b4ada588a0ebc7f10b2bdebe8d021a32aed646e233a050d36ab0c016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "ad4b705bcf4ce2b819f92b45e4fcdaa2003b37dd6823e75caa153ecf5afb1940ef79984c8602c94e96ee2be025d46a52956a78de57e3261bdacfdbde605f568c"; + sha512 = "9dc52ab05a4845b2f8cec4761fbfbab0e6872c233058ee2950d96e3b88e2f21cd155477e0bdea127c0c07cc2506f2b90015a2605f10d6dd38ccc6a3ea3f0e5c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "d74352e12bd6f7a948f9ef8cc383811f361c8b68eaa060ed9859d3680674c07a4ff922c818bc502fda85dd94ffefea679e6f9ddc927fd193ead7685f40beba75"; + sha512 = "88bfa07f5275f7985fc42cd42802c6c1b077c0dafa445a29f0a5346185a39aee380781b6112da52d79fde13eea4116763a2ba0d54a957b6d7b7e7363330de68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7fdfb976b9c586cc5cafda4cae0e6d379eed5ab0524bfe5cd5384612667a2949e5cf1e741786828b30e8ba67a4150bf34c4f10f2cd2c7aa89caede413501adc4"; + sha512 = "70ffe5242dd0173a384f59395151cbebf1113088d0880d4c4b9107317fe4135dd36a49884d986c44ee4f52536eddd35646e956afcff871a8250260ebde75c852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3a967f09b09bdb3b0009dee7896cfe787b65ae15095e88be6acacbe79f69411afc6d90638f0cd82171a4f8f858e366821d3b3f3cbe0fd50b03172768ad2525d6"; + sha512 = "9215eba4cc0dcfd27c4bdc2c8f89f71504d50a9636c240e275ca87c08238d09dae6a012bd055242d3785f04aa8a6d08a7acbede48af0d016ba5135ce901ac5ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2f9d078b65e479427c1a91714aa7290a2aec04cf3a6414df82ddeb5e830210575656d7e3cb35304c2d1fbbad264d85ccbea2e2408a477a396c368fcd4aab95ff"; + sha512 = "12f15f3fbfec5ac0cb0336a1c1085ce820906e75e58572f7dbbd9df7a5335caa59da4b61c7afbad875b73049521c0a5a478ae5584828f512eb0dcadb591755c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "bc3b65a2db74bd04e31082b9dbf3aad9434c9db2021d28f6a058ce78ade53b6ead38b9a7f123bf58e8a25f25d76a0e5fdff6372b04e34c88f4cf7e58ef80daea"; + sha512 = "b8110cd53fcdb4f5bc4fb2c80aeac28790e8a7666ce644c6a911b7e33842ae2ad12bf4ffdb5de68eb24ff7f66f2d54d2c2c363050465b1ecbcf59c669e991d91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e1910f17681e058fca270e37939e5b6003195499080d747f3bc5a4ee9dbb960919a440a7f627050dbd0b66988067f32e41599d72fd6bf38f07e23ad317f83938"; + sha512 = "969d4200aedb22282febdbe652e9a36e197b43c9e038271ec5fff6ec1c3597a2c90979c66d3fea3a4dd705ebe5072cc3382aadc6a82fad7a82c62a138430cf5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a5993b73b475483deab792e4f657a27994aea194c716246707a0612a7b5c4f6b8b7a23befafd7c6fe50855a11fef8513b5bf16cfc6125a786b7fc0d50b102687"; + sha512 = "d336b27d4ec459d4b9e101b74a267d78245cf18a47e9d79f118a5ea8b04553734ed51aca526e16c8e208726240112ba7b8a112aa6dccb5431260690af7c43676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "306c7f964d09d8d73b7c35161e28dc856917e7798c1a6a57bae7ccead2abce5a6a6a151f8e5a66473d3ffac43e0d0e2e4dd9d1bfcf66b23818e6bec246bd547f"; + sha512 = "6b06591468a5fd3f961be6e42d7df2bb302bed493c6c68816fcdba59ee090117529e2201e686b1c06a83273b29e807002c7b27e957f9d37af21a2fdf7ec56a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "fb29e90b0728b2a0b23e2d87c8baeb6140301cd0d6d89fcaa3e047da25c8333f5eda67a5a1582f98c6711f894cc08542a6e8ab0a326726e02c08195cd88131c3"; + sha512 = "43ee24772c6122341f1f88cdf84b23d53aba46af9fe0384a2518bf6e4c673522c57c52d211da306c7ea7b672ed1048f93a06861af39d024a8fc025b359af6a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8cc66ac0b88632bc40d92764f0efdb71a69949d29a14a2ea06907356fecac5faf472399fa2c55dd515579ed8c3501925286db600f9239a82a4963aafba2b56b5"; + sha512 = "dfbc1ec09705accca52ff20fe7b89ff724da4096f3c2b835cbaa3eb7e16917b808a8ffd2d37ffdecfcb905f0bc06f0bd620ee200c01a653cce9ebded6e475811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d346b5e10da51dd30b1b404f567673fec759ba0f8e44f0f0dcad1375df212aee58d34147599beef8eb78d12ff6911ba703ecbc3daf8edf206d19a3566a83cd49"; + sha512 = "4849669929700d2d68ced2f63c7fecd1a8788f071ab7d9719e69a63a8418a644e3c74ccc4028a27de160b796c0a08b33822890c355c8eef9512c72490d3d5429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "ec97cbfb74a86d96e05c70f73ac2e45448720c25845cf24e9c45d8d3174fe540911b691fa12fa96ed4b82cbf291a539311247d2b2c8073f790e1a3054997f50c"; + sha512 = "95fec85b73f616c5fe5a3a7da0f6b76efbe6b886c85cc7fdc66960ba6bcfd8348b0b77f599798794c0600c914274b50e878948ef317483598dbc4909bcec0be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "86676135408c0d9c268f93a271d959dc250d6cbd9e47273abafef0e5d8ba86a03e560539008034b5895ee0e9c415748c10586be538adfaeb5c7fac5f3f54a4f2"; + sha512 = "fa60e6bd7cdfe23448ab026c4f7b65f9b850f009cc7a3b1496e1e883316c01ddd67b36540e90d266d31c9698ec9b7db25e11e9324143eae7d3fdcbbfd80c2de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7fd5bbc7c046a09ab05f8751015d9c04f01d8cea0cd5252ad49f7dae612ac87d65d5992e840bc7701b3d99c90869143c721e690e51f45ac0311e27c45471b23f"; + sha512 = "c25b83329323f236d76783b17c192e4e5433b0a24d816bd81042ad082b0f7bd9905119277e2806645b0c3618eed880590c746c1516797a6ee0c633fe0baed102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "b1fb2a67f132d420cf47707e0f8c4cac748b2c010ae5df7720921e742c13af851b7962c6808316db3eddb31520fdc84367f9dcd4cd0549bfc5a0aafc02cd9b4c"; + sha512 = "26fe3799acc8e52768b3800bf06ec6ae62b030dbd39a6149f9a6623be55c031219125edc57505762c0f2ec4002d1c5bd1cc45f11baf36eb5eec921559c1fb0c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "979ba11bdc4a19cd0ff71c6626ec9bacd18738758b1748218206590c29474532ecf28aa9284e94e57db72b24330632913df89128a6e4297582ee64ed47e63065"; + sha512 = "d3c950fa9d518337e57b53e02daf4539decfdd12ed09768123fbc2d064006d99ab6a02856787c204e080a7ab7e222fdd94081f79982cdb1d7c9d2a04432f9e89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "65fc8854f5dbe87f0f548eb755b08f9dde3141c765eb6e891fc85cb91814a72edfd09d0aeeec2d98949a788a11a775e49a8ab16829358d8499b5ee27565da4bd"; + sha512 = "74ae91718c024a69c8135a6ea31936c877be690447686cd6e70c36aeaca23bf9899f691b65d705a4608202832cde9c4fc24b60c2f28e97363690a1160df9580c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "2ed2dc8618c8864497174245c50f6e4c64cb00225c7ce77c04a81619bf56fc5e93bbdaf7c215576e521a7951aae5d22ef606f8b93fb5d5a302bde3e92d2bfda8"; + sha512 = "5a48173317d01e1d3d3b55972c22994cb6f90e70a4790006b2d077976f4e8c2776455b30c0ae7caa4c378a1ce88a7d33357e451e991a577d5aacc34e9796a8be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f8bacb758829611b730ae584107964b4fdb3e202e45ce5ddceae9d6697c655377242a1550884051c7d6c18126fa24f8859ec9a8527368bb28348d16e69ab656f"; + sha512 = "2f24d7d6c8800943d066ecd962d4ac1047424e13020770c8585cc005fa22ee11e4050ca9b093d55534fb5dd60a76b79665067ab1b65d7321cf7f5bb014894248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "b20773a0ee3be91af9635e4bc92b148c91f1cc62597294f5b37608368b1c5fccda1fc203938a8ad7f2f59274dd6dd74e98d1436e74b6e4cd8ea21a6cf2263cbf"; + sha512 = "9ad81ece7338318f854acac4728eb81389327669cc5ed825f0fdcc2c330e6d871a1df5033bf52f8fa3ee5cf92fc94674b44a7f9e26d0d02f5000eb0d5c990362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ea05713f6f615280317d3deb14a5f8c3ab6895333333da165aac253c7cd9d62e6b913b56a850e82c0713abd1fa92c9f447771755b557d0056e10f39e54b5c663"; + sha512 = "c031247ef411d89abc0d219ce83418b3bea2e261bec19e2c454e8206d80e78e1bc712922d9fa64091e3cf881fcfb09dade12ec163c628ffe17c8472f64ca8956"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "73a8207478a59a2cf2291ae848dd1e8edc7274b4de4feaff4703279750406bfb9f74a3928f717d0d2274f0475b449c8327cdbbfe367a31f35499fe3401029f26"; + sha512 = "2e3641e6c6d33d13bf35a0996775480eaabf4f80556f8a06dd895e4f90a01a7596e45a90e3e85b76cf271fff88f15b61c0f9e14cb91560556d159a067f199abd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7a6f6ab7e282150b7020bdcc4d025883709088206df00f1eb47979a937f5b7f1b1f7984c3e9148e14ea669bcb4b9022c885816e52aeaf695098f55d9c00739e5"; + sha512 = "7ae337395201e2f269d09f8669838fba19eb222673e763a29f3b9324c939f9bfc365a80ad87d4a3ab15b20ccd55c25c92392e4d26aa47355d7649de61aa25541"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b8f7af681ee9f83d6f0ef76f860a399612a4431447f77b16750cc09c03e2b78b98f2b2ccd9b661221a17a2a45a3e383a12346215fc3970d6105c44ba4e655e62"; + sha512 = "df727c8439b09423d11ef5ce8c7c38a767bf1b537e6612e3d0d7deaf94a70430ec9a2aa22de5f47b94dbbddf8907d1310f87f0794e251275826e5ae8496e48f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "85978c209c7519862d72adc61065c52a2f7e2d3f37fa5fbc10190fc896506737a42bb33fca3f7532805617932e7f824bef010c43f51510b8c9e0609560c1918d"; + sha512 = "1ccb4a242d9bf02781cf81df7b62a21052a257bc98d64ff827528ed3f1f025ac86a8a87c6fb77ea8ec93f31ffdb6baf9f499dd3e190fe501e8823aedec84018b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c7dce64af32f44b09811fd42c2edbc58556c931d9e4d11e763b27d969e74d860a682108b5011335fc75f1ceb09107dc27ef1e4c0b196f0048fe8b3541bad8f59"; + sha512 = "538d1f17a9914171c919027e3ffad15bc6f7ad4b649a037b168639fb1144db76dd78cb588c105f67f1d7d907b9e6fe2f17d56ee3193490b9be548ad384a56882"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b63e73be6f0f7667fea700592407adf7599935c5a25ed93d140565d17f563fdc5c7e0cb688733916312287952b95f16e82496905c187d92832e0da296d925164"; + sha512 = "fffc1997ba99b1407fcf2242c88c0a48db8a43ac3d07f28557fda510729eb52e542aadd514a83dc54e0b4c5912f84117aae05fe230080c9bab8279baf3818e3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "8b1de2e32b3450c84184d20df16991ad0a84cefc745ef110c93697841fa5cb3f4bbd9d3f21c8df6807d6cacf97dea1b856cf651567858b4c7403738e7c8445bf"; + sha512 = "28c88ff542004d78d07a19f0b3eae3ec6943911a755ea2874df3bd37f3a214154b7a023bc3519ee8cc8cc4736f67a01c7638a2cca558e905e7923c6337c8e8ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4dacea538fe5885bc5030512ade78787be53db7625ca4a006c48787e6d62c4ac82b0c7d40976767ac483a6b88e4f44abe5339e7909b211cf1f720d584105de89"; + sha512 = "0a3676724d24ab7a625b768146e94a09332ff06502c7b1a72f82777875898a2f70717206d1798581d91d4d2991d872987fd4029df1d738f58b42b8a6d3fd4329"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6a2681ba41f8449503b9a55d551ca72a94c51903865062baf0f80e29a4cd98953ebfb239c72706e42795dc1a49d087822e4f13790298a78b0d12a0a08468691d"; + sha512 = "9a1b12fc9a0a4f97fa40f3ef51cedbcad60f44b9d77a7108eb6d8c33a403d333b58f9641b9a85eb61df9bee7d2a72054c2684548d0a5ddfcb8e87696814f6704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "7835ee1925c7e097cd16c92a9455e331573baa0a7c5150df27698199b423cfe0e511400955be5fecfe342d537b8a0d66e10042bfbe1f411b5b9563dfcd2f4875"; + sha512 = "020de326d0856914a43f1cbe4de14a95f0a051f99185cf9ff9ff122ce9c1edd9ec32f28101fdee484eb5c3380cb758108e309168051f048a4642598a2e4510a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "bcad9e4ce854ae1a36ffcf82690cd8f2240aa04f0a525c1c0d9149e5ebed1e78813488a4eb8330b39e61399907fd421542f1b10c616819b2567215e5ff5f972b"; + sha512 = "22b4e8d23e466c67bcc13b47973fea7f027a4c41d4c9950bad65a119f94d32935b33d4ed93979fbd8145d844aa12a38895a5ba932e00319c67af0f5a76cdda5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "205217f6214d77d0d8a9c33f5d09abc7c32488bdbb7f5e5221968ed490c10f634dc2ae561700f63408ac38d020f6d17937af2b711f2451585ff34affd52dd25f"; + sha512 = "5c6c05dcd81a988065ff94ed8ec93d6bfe18e58e877b03f5610ad2269ae46b5f8e3dc3c3501ce95c5301b1221297e815276dba2753f8dd75dfd8e56b8df5e2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7fff85971ce1150b1ba030b11b637c51f166ddc038acd78297aea2251b3b2383fec376fce58610bfa3579825ba66d9859a8f3e7d2e33939c82d4e692d9df5b24"; + sha512 = "244e0a6a34a6498871c599866391ecd7220339540cf3d0c3ca5047e1a9cfd2c79dd4709c2286565fa294744be405a7afe01ee5a7c6876bf51388b87d0e42877a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f3bc3e70cbc691ff611b6bac2900d7e547d80ac84b3e1caad250c11e3b3776d9ab4db7fca8db0c6888378a540f966aa57e100becb810b1a3fa5b0e8944ae81a6"; + sha512 = "a2516fe624f20babe6d5cc122298127d91d822237b7b7d86cd6a54ad85579b1cf2d63d133b17eab4f54e128cb71d2c4fb6a6c09bf55e317af26e2033f1f598f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e9c25cedcc9684b88f442918e0a5606c1bc8986edb8c1ac8e885b00241a792c115f118799d425a876c462aa25abb36708b819ac712ed0c854e114a835998e30c"; + sha512 = "cc8dd067bdbe62fcff881dd4661138809486700145eb54f2a6c375523f98d8a8da92672049f745cf7ab6e67cfee669fb8a35f572aa6525404fbc18120bf7a709"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "0e27ac6e9ef47d8e54ed5da4e88b02468596869613dd214066bee13c11c5a3f614fce3dc92f6e4b49250a175195a14fa4e11e0a576e24a550c02fc64187a7da1"; + sha512 = "540a41b4de26732c30ed8fcdacc596373e3d91b4555c6d622ad169b44d1f54051d6a459ea7f1ab36711d354ae2c8e65b9db3f3f318cdfb49ae6a412aa9f54d2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "06a1a97d89230b344d72544e7d16cf9249b608d5a8957efbd5fc72eeea09ca791cf17d040d3a8adb64493d2eb10dc9cc1c334a0236aa41b087b9dade15345f6e"; + sha512 = "d86c89ef09d63b596769d96c98e05ccff275c435d5299877023d59283b26506d1a1ee9a4d22faa66b2e4f9e8ee92984bcc506aeae807e40bc0a856d3fb2c3fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "6acec4d29d2a40e0d946fcd72ff1f623d54daf9d9c5c00099560fbb286dc91f1e2ba341153e97bdcf62f54fe616bfcf38ff1e6c0b774a7917653a7e422e26320"; + sha512 = "a2b087b07764847347474b5181b161def7e2551a206cc85c2348fd36e490ea4994fe6e14b25d3963993c81be86b808dd353c0bfa768ce7406a7b79b46d04c67e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b492f32f37ed40ab42fd628cd01d063a4705c8fd14ea599327f417231951a610b307cf1035cc81edaae2e784e38c55dda17275f77921e1a63936872d48944ae6"; + sha512 = "68928c99f7b18bea8c9451e77d0aa125187547f9f2aa6e8b42025ddbccd104e14352ecafe9a242d59d3ecd0fdaceb59f7522ce90dbf462bdc443a40756785262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e4a2432e279ee0046606ebbe84f0249afc225fc1276cd28bbe989049ac59b8c2fd09ef787fbf269367b45ff9c8092c6779cbafa45a05382976dfde3479527148"; + sha512 = "12225c779abbe923419bb9824f1e55f37a68f70cfa4e847ee6a44da9cc6c1fde6a97720a2a366b8ed8b3ded9e58447ab6705bad30cfc09a3b51729853c47db71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c8172442b52b48396b57b36a9099c3dbfac36020769101c6c2fbe0a1e857700817dadea56a775d62f127fe8f86b714be0d1be63c9dbd8a2aff15b6698fca84eb"; + sha512 = "dc0ee7c8ff43d1e595ebc5adf3cdf7d95a55824294af4542c94127a21a5ec0ea7f8ceb6d3f5268669720d928df2cf9c307899141e3e0c540db4779db2c9d09d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e199d2b24e0a1f559a551bef9f0658d23dd69b0a6f9e1c2b02885eaeade95144bea2a29bbdbdb0cf7e34cf9f7c6ceb49c407c34ef61f855e260b2b84436e38e1"; + sha512 = "2c631c16f8a79ca9fdbf15b5c0c70eb6728bc116030b180c921c1573cc470eb7273b5602d058c88e49be1320da62be5d493050574711cff7b6f40e6ea013ed82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "32552d0a4ec557950d64b0e67c572a7696ea7e58a99960b192e5b383ee30a39382c5b80e0fdb1b14f3643ec8c48a422098dbee1d99ad6b2c9eef1bdc3d0dba91"; + sha512 = "2a94ac3e7ef69bcc5949c1e920f55dab9e8e18c1a245763aa215b89b4bbfe1ce08bc00ef463e1edf66ad55b141335f4b4bfc0b09562639c80e9ef48181099643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "07f772b65b234ecdac971fd0a4c0ba049d17e148701b286223e972cfc77fbfb28c357e60e2311519459806b48ee8f10f5df96686a360b5148ad88c6e9de3d545"; + sha512 = "fcf60a56ef5d9bb195368f8883c5fd5b7a361e68377b1bea6a3647c392d3b818c01f17277f834e99bb55f69d9b0c64910df918504c09f3e2904c600217f2d262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1ae9d11b2911997ecbdf06c66072ba5584c70b33024a18aa348a50ce91019c62c862ad201d6cb7b427397eeaf0c7133136047241cc61fcba4cc761d9665bce00"; + sha512 = "83e34b538d183bd1c0edbae19280537523bbf1388b30b91a5220430255e824c6d8bad2aeb1e15424857a6a826be1eff5be9af0b29a57d637c061e2cd6bcf4fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "71786ab9acb16d3d2bb102863efb79e716a67ab0b32c6a6475bdcf93211d9517b862939576d258b98b543be9301c26e210c9f420ae084233e56d497ab49b8763"; + sha512 = "f1710159346685fa87656b8cb95855e97397e0b82d551b7321ef709cc0ab9e58afd5ccf3613b45667fe092f4fc14411b9071127b1f597fa97d5ec43457b91eeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "36067646d3459c6893f3504d5e9a7ae3fffa7291fc32969e98d4ce3223b09ccdf7e0b04a6b73fa2584f9aa45e9b38a8135fa243a88a50fa2cf745b17e7c17de7"; + sha512 = "0b2c26defab26023295668bcb5332258b855f1b2477cbbd284cd36c46f355921b072069e523db621de08a73bbd5d2f773a7fa4aa1d0c980cdb0c102cf7a99c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e6fbb31e7db958d00a937a8565e691c4a65b975c0cd3f852c9eb13e97ed195dff660bf36c40764d3f9169059884e384fdea25ec55e49226a02b693b9e2fc3c0f"; + sha512 = "e7ec02c1a2a5246bd2411c5f277fef6f72c0f21e5bc1bc3bf0b4fc10e384fd0442c092604e46546bff9a8e33f803a6353293949f4f3310b9dd67ce79e68c5335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "15d300f31ce324e89f7927e66e39c25a0437609817f321185b385ad4026eb2646f065f81a1cdd0ae1f7b120582603c83e8c2b845530a6d44871741a23f219261"; + sha512 = "8639b3c8e63f8955b46440f9d5b1b440c90fe0be9ec730d05312bbab26e15d96e8f1695afa65ece123615bb3e03d8e808e18483fa815b575c893840075cafdcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "7ee1708cea3282fb0de47147bc54d5738ec4420c3d8e41af445e138fe88b453572d6848de2edb7e48258bf3ac25e03fdcf22d768b220af6998e97fd16d4588d2"; + sha512 = "933be5812db81948566e2ab6216c98cbbf6f1fad32bfd9a5516f14cb2e6bd59fd1d34f1f608d94d3a832bf616d75317e03ef2fe797372cf0bbf86240cd47a414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2dd63530379b00312b310ddf63f7796b6eec97edfe6638dcc82dbc2648c42e9e96932c73f16518687f922cb1d45212b82b04abd39b2e6e7aed54fa4924a5da34"; + sha512 = "3d1b26b26fac99cd8de9177d56aac1f94785dd22cd32f94f5aa091a4411b6c1e3fade83863ae3badd786cf568f966f469122fce332d433682b818ea43f7ece6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a04e3c3202e12f7f53b11107e0db92282bb5d8fc6627f3bc8729c520481d9a3566d39c68c283a97959020fc62ce1095c5b19d8dd85577bd5b0b171f7b67abec9"; + sha512 = "795bd13c4ddaf19f4038658a333e8721d334c263ca57e887b944358d43bb3a682883fd3aa7b2e8abfaee1cad5bda3cdb3828f6f9f516c62a06f5899cba660af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "87afb472bc3cf46a4af7d7bef7b063a09208927fce7060824575ddf7197e6f58810e5e36631402deed1cfd5d921323ba9326547a57792e0c8f4166c061214018"; + sha512 = "bab45a77e2ce6d3dd2099fe84cd29a38154209339c271d35219b36f47d5028e87af0cf848e8938b8078bd94be04ad43c6f854de929d9bea78a6c029929e6ef44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c963b697c4ecbde0432170a068143d03486156622294ab46e1426e3a3535031ce4c8e2b49d5a5b0de721cf1dde2abd60b6619fd4f8dfea90b12ce64ad4744ef6"; + sha512 = "7b3f2df484031f9273b1efe6f178c48d2adea19edafd7dd97cf7d7056153730452a1711eac8b6303e069b0db063192c4678dfe6a177c046574984e47934f170c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "f88736bd06a98e2a03550b7134ed4b6dfd06ea0506f83f0974d1c4b3226a3a37c1fbc5ffb085c5cb044dd282c594ec8899ddd3aa1ab153f9a5214432ffafdf4b"; + sha512 = "05155d10057257f05baeb3803613f98665a43bab3a0b24c3f6a0900d23bc397e30fa28cc63e94cf704e3c505f1f0e2dd73b08e2f96471cdcfdc626e7c5c702cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ae0368b758e8a19c96a4344a0519b2b5c645e6bb19a3babc0b0fce9c7b43df83a5586406144d08df049fa984ace65f86282bbd14307364d99139549e0873be4e"; + sha512 = "c041d8f22ad8aa0f4ceda16931ab1fe6121e826280112dd9d2e991cf24e77c6d333175ec449fbf26c44eda79fe80380d7b17f02cf08d0bc23c4528ad37a6a5ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a003622d0b5b048087e80baaee0776ef0f41189bbab81441bd31f430947521149ef8671aeef02308049192d4184d2fa0dabea8c4b29eeff6abb005992278da7d"; + sha512 = "3a9d92db8de44c70eb4b5088e05f957ee1dcf4323bfbca4cfd1fd9e62332bd62c21e1df11792cdac4abbec39360a3297730a794464f6178fab7346a3175e1d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "71a81507a18ee16d947441f76daaff9c35a7d1f509ec4699143a7018534524f5d0c64340541efebacdbc7a163955ae06a143a165ac178a5d26c1b87b2479d669"; + sha512 = "12ba06007590a385453d1de574156bbe896a092db5e25009ea5f2327969c6affff9d0960aa42edb4bc087d9477fc4160f3ff579b032de4e395410530154bc737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d9fbed6bd402b3d21eb2ba032c4776888629e68f9dca68421418e1d293e4eac154bc26b0d8297e814dca2cc754e69b33e307e9a896bfa8edc0f2da7a75a8cef2"; + sha512 = "8e7c4e62be76d105ccc2748bf4b017f7bdd0f646ba17ad11e7c1cb14ac2aa7d612bd2f9cd39988624ff42fff57f93d27b9e44a31f8798aab54c1ec55ec027236"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "bb024088948f3be6d37418eaa0e987ddf4d9854e7d06513e1691c4944e1d8ad8fff1e65118e9f45557601a238f0adf07a1596e82293728f2b011d0f1784a8afa"; + sha512 = "fbb18fb347ac5319fa54366c86de16c615be994a7d3c179dbdb84c0cf349d53b5a9f850779a5c0d2fb4f58e14d2e18089d7856aecbd62c1cfb57382623a67612"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e3f21493b6dff7cea9564ee067445076b2a9967b752530a0f922a70794fd5dd120982833574240d0ef854734a397651eb77a8edd0715da6c8e1710c3515e40e5"; + sha512 = "246b9a718ddd70ba11fad500a0613f2b4feb62c7d6b483fef0715a0830ec09c2fc2063b16f2c1413b74dd0f57a1a870d9766e3740aad06bb131f1d610adf6269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9ad7444691a95c1b21fe149ab4468031a6886a42738f31d5aa81e2321c737d2c53a6d817523de2722394a47eeecf514d218d7e41158f42a80b9bf2ac3515a0b4"; + sha512 = "d0d694f4ba0562bf0ac990ef204c3d517a0e7edc9d3f119040e64c48fa6cf54a0ca945e681b8d5e4d89c1d3d2b9b895a324e85f0368e1bcee4d66a85d22c3913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d3eade70bde9bae372fa275912f3c1970c10978ac9e83f84c018b02443d341c21441b100f723c6856a5b61b742285606c5049328838444e7813e7427e1a0feb6"; + sha512 = "7dcd9e91b7227361df55a6e29f16af72dca0118e50c563c7ad2ef829aa016e1bdc7b89ec65917f572d8e226a0e7036d9642d0dcce86d5c15d2cecfd19fc0ad8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "412a873708341e94fefcbb5fd72661559a83b4c897f5bea8a17051759afc0ba214dbb9732f65d5f4d9dfdff98498106a3cce73cb4c6314ec7f7bebafd8e63113"; + sha512 = "c157abe8b5d69ae2777cf39fde9dee27eb244df6db00c5c56afe7d65ec1d3c78a7b4df0f6e6b681be5d741d61c05a9d9c56717716a87d914543bc0b8498cca0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "59f0b8e533575841f768cd80390d8237c2db3fc2f2e99bd87011a8868fdc76ee8e5a87401c029f55c990fb0775fabc163ad4d9ad1531dfdb7bf9fbb9b601e08b"; + sha512 = "70465733dbed4ec8977fac3ecf37c96e8a4c775537dc413559b1e9a1f2038ae5788b3d9b3bc7ab57b39ac1c1aa30f13f5e90b877228cf02c1670bb378b4014b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "29cfb3bb6bffe5960968cae3096c63d92e50c514fcde9a26940e8304b688a869d6b03ce7479df514281fc609ea767c69fa66fc1f42e9b0f3cfe3be9ea0efad7b"; + sha512 = "6a537b71d0758d25e97403363d0fdc3e7d311cd2a4ea818bbeaffb49a302e788f1727999c49ac39c6a242c31f5ab8ecdbe4111d28ff62954bd17e991a285281d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "f7b425e76607833cf4ed8e4381da101667c94d2942fa06a9be94193da350d03e8bd0f1f6d500ed0c231bddc3db5e458e9e94bd8ff77580ceb321ffdbd8a5e320"; + sha512 = "0f427ba0afe9b1a09b8947f0ee0de89c675dab2e5132f37ede9159f41d474d386127a1f1967d77f8032d1b48222a8cc5bf9782fcd1bdb3f635154d614a3a69e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "4f4a07552616989448bf5eb12d0a0ddbfb12b10b8f876d8a08f86bf58f113436b364f99ec26a20fc29eeef1030eb81546e0db1e92a8c86f46f6db1e60e784698"; + sha512 = "8fac0c28a7470ee83d559feebccf025f1a4f4802c92baf7fcaa87d4341bb7241727dadd8d715d23c4896e7161a9f6ba708a8c72296cd86281b8c0ed47628230b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5510e8a069b7444c20af0c95258e21d5d7e35baea46b83ed7fa3546af41e76299191fb8e14beb459c79a4a2aa5f195f6c99240f5f54a54291e2bd7256e8a9979"; + sha512 = "5cde88175b0cfc5d1332b7b185257d9558c3ff01d8e9d91180119116d14992be94bc29ad5a4f907dab0f8027720b917a01e0e924018c74d29ff9d25c3e9f3ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "c3b140194ef9fefe85f2aff0cfb44c49ddbfa3bef89b9b53d4fd92eea4532753d19617a57809c7d5413833e8055547daa1296e4cdc8f6d2a1cc792adfff65a79"; + sha512 = "f418fe4e55c89e75d243c85471b3f49fcac3f910c5d4eaa6b9828b201e886d931a18018906a37df9ab23e61af3f90cb333098fddcad0da3b0473c14d716fab18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "34e457813bdb5201b862dac75309ed6e0f4d7915111e9956517de12a809cf7cdf8f18238dea9e480434334d61f0e02cb1d3b7b63ee1e83f4854bc76507093838"; + sha512 = "2f3aceb53c5bded3e826cfcd9fde465e420366fb0cfa6f49c8f8e614823d3ed008b69544873ff86e3b6eca4be961b0e1c7299d02d39df0ceb51eee3f7803e93f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b65b6560c82225baed727e8831c549512d0d900f41c337a759d941b6d78462221649f6ccf2a3cbf889a838518c773cadc034d70cc34ae1253afe74af8e173220"; + sha512 = "f6b36def280b0541be3920e05649b488cbf3d4f55541a160373fb3a4d5b6a7f3f05fbd1d5730c479c690fbb44f0ea5bbc1ac3948f16d0e8e3f54352a12fd3e1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c0966d7b799648a279dc1e53729bb1eb740eda31cbe008623e617085ebd2c6e76fcba68ad038b6b25e9f22032ca6075a66dd3fc068de7edcc9a297ced0353793"; + sha512 = "ffbf547964ac4abb1bfaf563a42f5828227b37fd46686318a7ed73079af30454aa3a3972ced2e887cb1d95ff048b0473ca2a210084179bf44c47a3b394c4adc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d324a1a87dd4ce1d39691e1f5bce35b0576abdcff72786703f9a1c336706faae885b7cf3578fd5436d3a6c5e30aea2f80276cbde72c38bfc546fbfda60ba29e6"; + sha512 = "d3c26b9a91cab7dc1a0b4caaf87deac657e05b8164feb5b167b2af7b0591db99a5310bf3d4ad90687d5761ae36ef00ccba8da6dc3e2e6f5be867da69bcd9d0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7aea87a05327f9d322931c79f39635d4b395a648af26177cbf2b4bf261d2fce0c756668f0de5ea6d3bbeb1fd51f7d4673882573a5f67ebb4406434ab42dae86a"; + sha512 = "c7a8aa830cb8a4f2eb69cac3c18534c03e2162f16b999d21b6b17c7b815391c26c7561ef4f8509a0cefb6fc22647669897c30e0289b1f91c73927b80a0d5ed73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "cb0a81af96aa96923a49ce75c5dd6ece2597c1c7741127b9727df9f403437e41da674958dc3680d60ff599bdcfe7320d3c18fabb7cf28ea1db27a321e25506b9"; + sha512 = "8aff68cff9d430b0c7d25040ad8059e6c80f058867e04eef5390481758c4fc6a840e194edc4bb57b54dd8e9d07b26c17fba016a773b48f7f771c24a1bbb3b593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "546a0f63b7221de9bbba1d055d9d27a220d61527957b236031a062a092d73a55dbc8699154c6cae7d24cdee4715080fc99c4d15d592a7dd6af8a1f05811199d4"; + sha512 = "586adc6942c53997f6c6bb44263a8aa6089c4e9fbd9b887e4694ffcb91c478d44c3972f357d014a8f10b7cf23a85831f75224be6696bf7cd4dc9bb66ec01fd48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8ad727a32508f339880f10cfb059c7f3efdd2a195490586d59566e622f99d58a9f0e72d2975453e795a51c6087b0e400c7deac34fcd250510eb85094df08128d"; + sha512 = "ab93b73c7cfdee88d4d6d72d0c2d34d88705c50d41a29ceef32360d00e4a0a6de97fe33ee2406733ec233db22d4be5502987c8b80c67e588e1b9a3780b707d3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "21d1b28d39098f9580f8573a85e50c2ad9aceee4c9183dd4a6c9ec673cdfb1411c743c44a26737a662fcf9b4acd9193ffba69016a8ad1ad8a2e85eb1723aa55a"; + sha512 = "9e981a209491738f86c33f6a7dc8b4f9efd31fee9e89f2b7126c9c160a5304c48e2be026946dcf684db68c1728e3715994d665fe5078e7638c8a93a30ef86165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "71bc02ba091f38f0cbeb76c14e0009152a37a6f0adbac5886918fd2b6e75d04f3be3fcfb85230cc88664199422c15041d44991d476b8d5e827e502b145751fd0"; + sha512 = "f3fd18886957c4d8836cf45ddeb7d23626bcdc28992a1b9cbee941de7ed6aa8489187e98a2b7a2e675b8f40e5d3ad6508f8bcc8b910cfc8b41f9cf74a6921857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "dde038391cacfa4acdb25b3c703cc16a98c1a6115f82907d5dc40dc9512c904772f73e8f27651ea0dccdaf703bbe1dc4fa8f8249937933ae7ddbb51d0787d9cb"; + sha512 = "6b03ab97981e13a6bc222f88e5a3b53051b4549d6ab0c36a39689a8448eeb20cfd5b9d401e6bfb6a99b1f85f0e91f98d19ec672c1ef2965ba5a35711f9280266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "5879b59629f09cc265a1ab6a477899538f1ddaafefe6357fbe655698096d084df9e0f0cb7c7b4387e3ba14d3997cb36744c7e9f92e8967a44124df59cf1d00d9"; + sha512 = "03611d923646638cf4109fea5080a8c874e4b884bf124a0da4b6739bd863b40dd32b18b2845f8fe61cbeb280ab2e82f68d1f7532af4c92b8dacea5e92d62f525"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "fe41667306010fd00ad3611b4c426373617c5eb64345ca3b08d86f0a28fa2055f61c1ce3320fc5b26223b851eef19168a2f43ed2e4e00167ab937d1a1f3133fe"; + sha512 = "f7428e4d06a76b7b3e134acde8e9caaff2db336e7093776fa2692d923d427e667c78df3a09222835248b029b05d13956b61170bff310e7444f0c3572440a1d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "5520a9cbabd270113dedda63162a21af2d284e0df6a9eb9b5b9a55d11989eb1ab72e6b0cde32245716de15e7d89ff54f26ea67b56871c4ab94de690a015c80c4"; + sha512 = "e828d170628f1573c6d4029a9c8708aadd1846aaa76fc5afc50c44792235c060ff1984800de78ab7875a0cd821f53adbca419864871160d489e64f77d2ca513f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e9f33a0476c90be99f3e66da6f4c244496a5b20a45dd81b8294446cab71e423e8a6a77442b2af268b87b62b329525690200b54996856039cdd857e5ba4e07f84"; + sha512 = "94c00340adc8d85c52db3dceb604f5ac4e686b274f6bd130350d6c1c2d48fde792dac6feff1ae19f46f5a757280f0f86a352434e7f8066fcbacfd9077a831cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "e021722d534ab811c632fd472ac1b3cc24a49865fc625476db9e142b8210dad7d9eca87aac1537b1447f38f2264b7f61ac7a780edca4929637f78587378fb66c"; + sha512 = "508e1a7aa0dd250c1f50ca8c1a05c02c488916e6288d5d45345c4309a96bff4696f1f365bb88cace1465e8fc97073e58c3a5be69beb7e03b47a178abdb416de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c7e8e77b2a71e57d8114ea0f4aa3f9653bf5fa695091211534ec1eae3185b68c557550e8cf7a506b361310b95274e4a5f21073957af25ea4d19c8fee33b07c50"; + sha512 = "6929a0a72b082a47e20dc0ce41a6b982df03f60469f3f31499921c0b293c755869b978e224e90e4f3a75c41e88a635bd231236d72fda2fe50cf0f6b314178c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c82b411a66b0385ec8e9708ecb9e68a3c6cccb4088d299727b639adcdc41edb740b79721025c6ff17b8e3b3f9783ad7405ffe1da3c3e844f82e640ccf076dae6"; + sha512 = "c1363abd40a5e76ff383c32f9dd58931b692c1c7582cd1a4d21fddf95203c0a34588075e4d420fa39759844b9c0bfb9916af06ce260cceeaa2f0f1efff37b2d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a45966d7dd15c325588705d209409730ec21f828c5dd690e705a8540b58f278f4ec67d3ea17c4fa0c94f2de9765de7fff71c2fa2d3dac851f01bc5df856f6c8f"; + sha512 = "95d2e14a1b77f5a3ca6d113ea5cad2a7fc4a0a8e21c7c40162198614637c0844547261a2f14242fda2cd9053391a78f3e587f21874b798e8fa522bc71d62816a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "bd205990181115edb1b9134c5a7ddc7725699ade854737b8d27018b80c4d6d5d0774ae92e6d64c5bb160f85bbe8a3cff7033893dbb698adcd4bca0a189b6dd20"; + sha512 = "75e8cacd919ea8721102f6301e3b855d398e9ea01c516fca6eb7e94e24cd2ceaa289b3a6ca4afdc658c70dc46e2ec9b0bcf3086b70ce857adf7f0fec31996d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "0cf7a3617c4cc9e8fe6753b1a6eb2199b3ddc8739efac499c45f41b79f319c4cedbf8c9e522c13150a7afd622c569c66057f934ff03176ca33cd35cf51a792c4"; + sha512 = "aa48016df099652eef14abf8cc774cd83c3c839d9fb47a6556ac86a4bef55d80855ff2aab810841e9c2ef86c47b968f57a27e0cd7369ec30b21bf29b423a6a02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a65f9f11ad6dbd82b64576a1dae5b76d30a353478932b5f8afd046764f9fb438c10d631935ede3743155ecc05612247766a1b3b603e3a9206538e68e015b6eb6"; + sha512 = "f40e4e169272764a55332f868e9a6b19ef54d04ff312827a0cf0c3792a2e5c0264f62b9cfb5939f0c43775811e350a4913387e1c4899293b7311a2b1c505dee3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3385e2cbee86b9fbb44a1cf719a3fc6dcfebcb67f8adc884bf207e887651befa00f55aad6c74e009bbd4b1e07fcf39bd299abd3ff9d1c9f44f9ab33a1f4bd129"; + sha512 = "4a8ba1adbfbf88332adb40336b986a42f89e4789a8e2da2ae485041788bbbcbca56d971de43ae640022647a3d30760b4b5e072afafa74df0ca90449aa03d93e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0c3a323e1e72cc8fcfa153def5ce4b2fb90d69e16ca4e4b6472561b72d7cfddc28e8ee3f90f5b9909837330f6521cee5b1ee86329ff0db245c0ba94cbc87da9a"; + sha512 = "2ebf6eba002a877ec2d3a5928a46d6b39d5acf10fcf4c0238695e821bb0e0ca2ffa7230ba3bd910ad50f429712f4bb7ddf8bfa365d23034919d3a8e4c19188fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "18e7e4fabb8a42491bf083863b2979ddab9a3a914ae476b2cbb8a290179d3685164543e637bfdf905655c482634b1914903253d7ac120bb18d122d0e60ae1f85"; + sha512 = "073224f374af0b25249f30112edf86b32fd2612b571b064ae4668f2739cbc02a33df0b5a459048ae0ba2d784035b2309671b61a5a894857edd2ef6fb5181b120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "2f7a98b86c52b35ec5cac1b866b844474020eb0076cb5a2fab4abf6bd12ab3882a54b7b324ee3491ea173c206655aec3f854a9f0a29d934405359c56a34bc9b0"; + sha512 = "b654a0ebe06c63d9324d3821bdbcb8517a50274c3adf6e5f24ffc334649eaf6583774af15bb485f115c129c0ab5c66b31a17cbef97bc9b4a65c1ad09a333df58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "18b8472b4af585b65995b3d25e6fe290d5758a06b1cc1dfea4ed3a6512a8c250c2d3e0157a274a35677183b2e4a89d1b0970d310e8dc319ec8aa8f1c02a6b70b"; + sha512 = "43f18c506cb0964f860c12b16722f2c53a0312d007f00c4d248ba3babaa9bc1363758bea6b6a7207ffe477cb23e7f7c151a1578a49779634b2f8d208bcb97e6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f62dd81c30ae0201d1f7f98804c10e8e431bf19ea3249b4a4edc71ad2103ecb63efdddd5153059837dcf4d70499bcef5b874aa69a15a391255af0d7c37a65b5c"; + sha512 = "f40697b407b06402abb256d17322337b3ceaed07967d88f65a4e560090a0077a02fd96fc06c5937b8404a0d96353cf447ac5cc3a73c655224f65ea9b21364915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "955b9faf5f17f598c13d51d9845c4c520b5cc93c0c0433da189cfc43d177665f47f2894f77d2dcc195da7ebb16870200d49703e45eec6769624d6f4c52d85879"; + sha512 = "00930c704aa3ed6910e6f0b03034706fceb7ceb6ef5c46b8eb2c8af4acf1bca331b0432f3b18419f715b4ba862691543e5d539ac08772090b8d1d15868854087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "6a400ceada231224f3e38d4583ab064fb6a2aaaa89b886f21eb51435ecca32c5cc0bf4c67041a3e04ff2006b1d12899679e0cd6e425e39b005ddb5ca80e4aaaf"; + sha512 = "baacd03d232c645a06773dfcaeea6597672bc619eaccf5bb2276ab66737264c26c050a7d8f8f6fd8a69b3ee9460d0fa3d8308967af22cd1a4ae648a9f07a886e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ef19a79b8ccf2c5418009abb06131a46b7205899a71b48baac0958062f73c54fe000ccee3984c42cc2fec2ceb2aff3644ee260754af5ff40317c375e22edd9c3"; + sha512 = "b27205d604a460dd45bc4c134f76f396fa9a9cae04da1cef936aa0a75fe3ecb683b75c88735c468660d8584a2cd0b00f867a8411e20465d03e0ce3a57b2d9ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "590785f0a3cfca1f8f7518cd6cf93398d71f1bd01e5bb6add5c79e3acb7fe8322d37b77994ac33d4ca33e19a81dce016dd0dd479fc38a7ba611d7a4d8fc30955"; + sha512 = "aef11773f1498d65f5a4d81f8d411bb73a89a134239826589842979528e44898a4ac8005cbbb42fc1eb56c4eb0f920e3a89aec9f27ebcf1b922b1af1b037ce92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "77d6741dc35da55b92cd3eb5ebd3a32a96cde805e53314cdd64ac0ecca6a74bbb042af6cb778d344cfe01e88ef5005c067f964609404e55d4076f1427479d629"; + sha512 = "a50410b04c8ecf83734ae318d1da075844b50d6bd9147bd92a7ef1e59effdfbcc6ae2c9bb6d01a03ef3a0364623c36e7ce7e78a6caec5d75a561ac1770285282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "1aac86496779b9b6b570a7e7b0b4c8b443c4ac13e5dc548290d33dfc64ad940d6058afb7cf062d8e89baabbba5d55f285d1724322006c15476005cb0a04c163e"; + sha512 = "ca09e94cd945c182e43b4e661a50f0bf462956c438c83fb180a6dec8542dafa9a46bbb531e38cae30ac5facd6e2d318eb5c74dea86c8b4002228da5124c6c38c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3ae95a9255c6dccc8551d59b5428345a672b9c39fc08dd6e5b509ddb64ae0af197e6f1823e1bee08a2393c54c17077529a474757aa0a4bb70de3d868ca934023"; + sha512 = "03af81ef5b4472877ab0f5977876d4713f7a75759bf8012853429c57ac11d7d3c71390d3c899d653438df5ded9751e5a9ad15c7c7550adcaa04920d473b6bbbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "41d5e3a61b7d8ede3c040720fd6be629f948a8fb55617a9cc6333c275c00304e990e6a0924d2eb4fc16544d855208cb2bbfa633ff829fdc37385b51492e49416"; + sha512 = "d6d2ce2c896cc415b84a06a9abb8727bf5e1c71469f2e1d43ef98f4ad5f854ea05b5b90505074dfcd3176663bfd50dd64b435d5aea061f5be9e6c9fdc4f8ddd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "bc409d8cb772d57ac8729ec61d5fb71b7df32d20ec9836cb1c2870bda85ac8f1d6263f607ab0be0e2818795969bdd4fe41b48c9fac5827b363868505867dcf87"; + sha512 = "9593b5d051b3059b98916ad8fa2d49fd436d76270d2f3542e33d58fd9f9a53fe7706679224cd34e9ceb519c5f31593c390f8aecf055302d1edfaceb4ac8673a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "4c2c6342a08da3991c4b6a436cc638be0f600b34e7fe02d75fbb6c10d297e693d2aee44624e6ef8543164f36b11a466f4f7c7bec709682aeb870e591523d72b8"; + sha512 = "db8eb5f0203eae6d21717d52d879c229edb5ada4cddfbe60909914dde9f3e8060e85a04ff865e8f1fdcf77035299d8003abc8e380cf02f41d4c45013c0652dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6708d0ad517b3551302f0b3533b8e365a8c27489b781f375fb469e45b8e9c84df11e0ff4299154ff7e3132e233b5b64f9e41432f61a399ade7ee0409fb1c5654"; + sha512 = "59fbd221d80e9ecac9021806ff977d988ff5487e7e0f51bf89e91d0ca20d55c2ab492dab0f68c47d8502a0323004a35ed027fb5bdf7f781ee72b64f4b796c473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "cfcb6141b3bc780f2bd27f9226f5b0f82d86ef9f22a15066ce57f8f156727f437b67b3f165c2b450fbf0c0492a2c9d246f2fcef417a511164ca29a4a7fbef6ff"; + sha512 = "ec20f49c5f208938ba94aa0a03fcf6b85b7d987fd05882f4a473a7a7f776254d5264841bd718515e1e35fc20e69e46964f637d559e39a38567749f9b3d4db3d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "2df73ada8ee40a4a6f01143c4dcef7fc5b5efd486a20057e86c1036d68018651c2451e02c10ba127a110fcf8bf88f43928ed8b65958b1c7598b81973b79ef9f1"; + sha512 = "6aa15d62fb495464518761add56f9f373059ff0029a7bd18115148dd23c9e88c1e9c1b3a23be2df2bd33380856888f58a7c39943453cb7d060fc5cd5619258be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "75f0025e6d7f6d63fd4e017ec68dab3de9cda824944d73319580861bc3be599d5ed6e4e81b7b4b4fb8bc8be7d530ccc52dfcfa920ca160682ea20e499a863b20"; + sha512 = "e0c11fadff083ce242ced4d76da9e6187c621956ac77524733394820ffe720e3f9470fd4f3485dace497acc1ba04a07eacf9f0c115d081f8a9b107f4ce1f4568"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "763bb5692bbb818688ce3ec8ea78a9734b4de8ee29ec9ca8516c33e406913907affe211cf7146428b176c230353f0468824bef69c4f5ccff69b75ef7c302a1b1"; + sha512 = "9bbe79a5d89912a4326af31b7c66ddff443e203835ed306b8cf2f409d08f9199e1f588892f349d1578810a618fa8692323d5ecdb2c987bfd263f3f4b18237f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "eb0eeb897688fc2f2c29ddf31b76e8e67a40e620f7892bcf2379f2d28dd033070fad749d58770709f73610dbfa512331bc090ef5f4a8c561b196485e30dd27da"; + sha512 = "6ce14b5c4f7d9c82ae6b62e08508cfd4f619800c59c59290943e1c66369bcf87e05029441f6f4141311aedf9d13da000763258da67e54e5748efc0b07a76deaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6860fa25a9b2a1933784f0d4bf2cce6066049586a7968fcf3dcf1078f1964027fddd28c4c18842073befdfa34ef5b9a470d6ad06f014d86677e548e1b4b6de98"; + sha512 = "4c457ddf3cb1d1fcf35fc27f405ea5bc9154447e24ad95d16f768768ebdc800f6e7b164b0366a05d2d9c2810a8ada43eae58c5e5e9fea033fa67ad3a306aa9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "b060723474d8075a3b0dcc32387983a4fd159f7399de7a4dc606a11dadacf2b6b8af059238045fda70597c1530ba6007b7a07e065ce153a5b992965d1889a964"; + sha512 = "ba010386a6bfad89da7bde1cad05b88e26abe485e664a13c92bd97d247fc481188d44da1d20053a157df1024d658edb2952d7d8b1fbc6821e0e8e4d0a91388d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ddb772b303412b1275dbe563b991038fb5b860a7cafe3c79ca4a85070cfd1eec1394850c6478e3e2c89353c1d90e7d99ada1b2adeb35d5b55c7b190881c1a920"; + sha512 = "0bf97c198c26cfe13d95f8e7b5f6faa7dacff5045c1b030b5ddf3916936965ec47d99e2743e0e3c7dfa83fff1a03f588fe30632c13d25ed7a3d417982634403a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "91e4108240ee7e2573935c5db84ecc3a6d1ffce5f508f6a725e66d7d633c23f48d20797bb664a6e079e0ba6f4ad6a12abbf80a43cd51cfbc925a2b10e0ac0473"; + sha512 = "c6a229f46eeb3623dc94394b2110b1e8f2cc854f82e87316aeaa01dd409267fece25de74202df41e50ed34a89a75284b5a32e9322ccf771bbc38cda4fd7b8f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e4ca27faf36e60fd8db2d338d6cd2bc57c27d0c446e7e434279c8c663235b69b16dc2a957ddd0f025ec71650647459152dcc289a72b90f8b94b9e50d69ef2989"; + sha512 = "72559e85a3be28e3f39daf4a2464c9ecc48f8a6c911b0db4183b6b5e897c25a639a30c11b71446799c4eea50a09f3f02031144a930b37b7ea9655e0235b2981e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bfac00d8b23fe24da516c22e2e200f68ac8057b09fb3d93969622d4c703d2a74e64f86d6a0d942c32eee4cd6fb50f1324035a6d9be9e6f8d98781eba28d582e5"; + sha512 = "6f9482aab13ffc83e6efc9834369629c21ce60aebaca5a8e8935538ced4270ecafb3b88f46dee3a5be3f13b556702d58092e73063349534dbf2279a91a096aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "3548acbf07cd5012fb75f739f78d2b4c63f01253a06f094d0433f7b631f8e3ab33f887459afeae7f855193c5c9802ed96f862d41e937f517c6f84edead88a624"; + sha512 = "541eb087462b501256886853f194c1078942bdf31339b453f9d8ae058902882c7aeba6c67157161cd6ffefeeb3791a4a63b15ebcbf813ba5c00f4f4311ccf008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ff30ce6eae9d2e78aba595a5a8c3a6579243ec585f705f949402cbf930f7f375b2dbaa36df40e888151831d2a2feefcfd91eb698330df0c8ae67bf469e782ed2"; + sha512 = "6a9112d88bc51818c06dde6643aaf606831abd00812da9e372415784eb3fbb0ed77914f60ddf1e2cb0f95b2379378911abdccc4f229ad5fafac98c81be60dd13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1d052d53ebae70c01c9aff7295d20323403a067275b59e6f66980718654a3858d55271d31fb0812a22a5dbd7cc8a1db8737aab1e696f4fcc99cd9bba42cbc812"; + sha512 = "ff1742130854a5d61ddb6a22c8b61eb1bb71995f8f9d0f2ddbf032edf0e7a70cf4e64690e7d4ca05b1fe42121ca8b389244d492234428b517771afb1a79ac803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fe0c271d4af2236ce8d2b489eedbeebe185da434d0b4080bae2ecd222bf95b4b3828860c3186cb79434ee60ffd379399b15045c8231ddd56aa5c210b8c52c856"; + sha512 = "07d1c523173fc4eaa47bc6a22de40e73849960b9f8f92139c1ca95e3e35a1b852b69eb698912e0e2e4ff4e265801779a027336ef788e3bd93a7bc49fc831c577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4ef2464fd35bb71ebe6d86d0e213e9e5d33a756ba139d38ccf903ae852dc025e5bc34727cf4a8c3a8a851634c975044b9c9f91ce64adec8cace79ae1d3e67093"; + sha512 = "bbfd0b2a751f02993fc82f1be83ed6ed1a1cc054774128423787341faa059ee1f7d402741f78d8076eb5012bef656037bbebeea0775284cd4691b2fc3053e476"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "da7d14a85785ec5ff6fc01bf6c18b7468aee74d5cae30f11515588ad403a3cd571890843f4a11beab08577eaf78ae3af6bfd757cdfa628c36aa95feaea6e5a5e"; + sha512 = "925de39349b7a4bec721bf494fa8af8252fd923b0976bc1a99869c5bc5b083ef09b8a3116d79aaa2ff3bace9b0df26ed455ea385c6853e0ac1f4a03ce257d51e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 97ce7d06c411c23545834d6a8ad9f9cafe441500..eaf304ca9fd4758c008cfc9d1f9988084428edf2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -12,8 +12,6 @@ , gdk_pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -30,6 +28,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui +, libnotify , defaultIconTheme , libGLU_combined , nspr @@ -98,8 +97,6 @@ stdenv.mkDerivation { gdk_pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos @@ -116,6 +113,7 @@ stdenv.mkDerivation { libcanberra-gtk2 libgnome libgnomeui + libnotify libGLU_combined nspr nss diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index bf7e7cfe9d3f8e5d34017dbeccd7c2df46b8bf55..968b65e724763935c2085da50d046de0d24b62b8 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "60.0b8"; + version = "61.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3cfc027c422936911f669825d03be090788fb94a33e0e67b2b7d58aed52b719eab4ff1a7e19ac368543a4b662766a41062971b9a5fb5588b76029fd8a78dcb1b"; + sha512 = "704a4bb25d1cc2386a63c4883fd43c7a1720387f85f73b9cd4ad32cb41238d4289685ed6d62777b5748f7e18960dca73d7d204d73a335c542ad6363fc2b0f6a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a8d96e9d9529b4c068371cda82219bb334d54e069b3e63caa6de4054cf917eea2aec9e8767d64999ce72323ced179477e07791ec8bb23d8231fe268f92c72042"; + sha512 = "e295c3792c8e179e67e75b0999caffefa4b1abf93f87ef2005299f31188eaf48d75cf2775f39af547ee06b0bb3cc6b472a5bc3dc33e1d2e1b683ac26edaf5a25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "18b5d0188d6ddd22c2de16c02a3b3f8eeffc25cee1c1afcb2bc9f80c722bca7c15f9561c9215e65a5390b45989c235f5720cfdf01005d7ef7e1ab1119a7ee294"; + sha512 = "0d358267b73441f5ade02d4e336a08ff5196e353c5c2b4ef0833455d768f3210f7f05a98ba57e279a8fd40cf11183a1f9ab92453ae624aac42242b9cd27c261d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8f8c83b0f4f0031dad8d3fef2db67ed7ee19e794a7c20525dd91f5024cbc1b7d1b0c9c847173b2aa187050b8bbf68f537b7ef91ad7bdf557759a3ecb4ae7a98f"; + sha512 = "c442173d1a591293dc9716b948b0183bcb935c7a3abc61d4a1f8da2a114e4c9d5e8bf26ed5559e5bab70fc62f5c12d36fd2ee973c0556641788c339c836219e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "866bc322de99f428e09ce5cafa26dadf77117ead452a527fcaa536da749e9eeda0a82f4d1c5e1aceb202fe931a79fc99d2512acc643a88638c5f37c48e19454f"; + sha512 = "6f1628a9195ab30a6a87275c70a3390d29808242c3916682a9b83fb932687a311a434b67c8c333e1285fed1337ea0c7bdccb047e39cc4c1ae454572ba32ecbf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e91d908997d5924be2f5f7e7afd30a1e5d16d2227ea066a3136a12976fca7fcc89989160a3249ba47145518b53c4285cc7a9d39440cf8953c1729179efc1c690"; + sha512 = "41c0e5a30ba84746963e2e48c7092cc389617fdef861408d081c6fe75200d14674d7e7ecf1312158f723cb8b860b9e39c9b3fad802eb9692ec00cd8aa818b2f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2dbb8d8df8177b4f4f7c69d321817b3ffb4f4430fd8e8250c2cc3678d758c01d9568873270b7aef2368145b6f5ffb0e358ed6c74864c9b883b6c04e11709fff5"; + sha512 = "2c282319205e9a8d5ad7b74480732680f2addef20840d39bb368be0d47a839fda1d039ad4e7cbdb940b26b1fe2ccb19dbcf9d17527802c8c9e41fcf82dd67943"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6728628f6b71a6d495b49dd32472a64ddb3c41e2d9e2923cd033a37f19d1149ba5d3594598209ff5b59f0aaf6b0c2fcfd4313fcf34c9ddf3d5b6bda034dcb6c8"; + sha512 = "e1c573e1cffd888b2005d667c8423a8cb67ed487bb445b0333e9af9dabd2d8bcbc492d642fd893285464ebf83be6bee2fd4b9260a4cc1e826847d545bef2471a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "1b71d585449f3da51da9c9934c9f5bf15b618bfd6a80e5054137c15c16b245eddcd50458cff69fb70ba2ac050b7fb6f316825bbb49e2ed640d63055a4b80f145"; + sha512 = "08a3453611833ce773b4cd3a31aec2ec7120eec1e1a87459f165863fcf7ac709e3c0a69a0cb76997650a67a04cae09b2fe7ab2820a338ba040944f81c9417554"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a84a384debb371c3cd7b4c4a30cd66f69cccd658c089c10339c0fc7c0b0badbe8600f18451bec4352cde253ba7c4cc9566def047d7df9551214dfe88d0965ef0"; + sha512 = "3ee61d526e2c76028f808797df0a2fd4e42d856b76e36538abddbbcb7c41949d2146d5c7dba2f5802d143c209ae943ca8d87123ce7bfe7490dd17058c1c32488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "b2f2c879b067d752c69a841c40b319db0d36a2805d441ee832246da199a0099cd359c0e925996c152d67e7d5f733ddcc776a393d86090c455f4c5cdfe79752da"; + sha512 = "f5178ef8bd83658f2b097fb0d9b5623ebeae4d715156e355879f70ed13b91e8d20f9ce2bd4fab56455c9e45d18c0f6081b798ce3e31b9a473c40da1366538720"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "db7d9c6e991b3be123f80e62f5b1f9107ae537f3a298d65f910c71397183129a4527e324f75273605a5b945516ac5d2bcde05a3fa3de9748fb880bf0582d4e74"; + sha512 = "89c2f4a5b8b18fe7d49333f6367696cf7e937b3e62726753d9339e498d9929969f5c0268fff21738ee20326c89e691c40e95b6d20c4c7b1acfc535d58e681b14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "df4dbb35c37726af2d5fa1dbcabd8d926f171896b5dda453a07989cede18f58705617e67f9b0702623ee4cbfe570cb81fd5cd9b93a050d2b75e28843fa5a81ae"; + sha512 = "213136c869e9a4a475e5af94582190a3e6c25d49fe260a210221571bbd604ada4b60c254dfd673a9aeeb9d048d4ffc5123577f6f7da0b440ba9668282f3d74bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2386672d892863c4d1ad4a063270125703aeeb2f2afa8bc09cd6d813088c9c80f5837096207c8a662d28025f9c457903f036f79aca3fc3b7ba97660ae861f1b9"; + sha512 = "981c5d319f67de4c9093c57623d1b5c1e5cbd8f640530c03192fa11db3051ac724e014f139d7bbf96d76440a594ed33e4384b591a882c7da7974105ceef8ba8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6f6d1604cd1060a5efa633cb09ef8525369245ef753fa7894f17299d0df2b3bd62c7d2ac8cacb93cf93961dbbf9b240a43d47a0c73cbcc7ea09a2cea2b86755a"; + sha512 = "96a431cf96e77cb714a31b3b549dc1f7f26416ed0cc32c804f1a139fabce217d904cfb713e7dbf298ff6c42f47c317be943fab26840f9db6a58d675f95466dbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5b8dd67086cfa08fb76b066e2c10be109e0a4eddeb5e4579aa9366dff50642f5e56f6aec37f9aa21299fab0ae7005ae0e6ab4db05e079870e2f4620a4d96c54b"; + sha512 = "a190976d1e10338ac056a452f132ef042b997ab38e1c9d3c3e36d7ef1de843ea13d59ce28fce89ef25d6a98b3d4c7840fbacd619001e455eb4e3b3812178cc98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "31347a1cb6fa703ccbf444830fa88f8535a2717da85fee09f6a544ee8aba1aaea093f4ab1368f0dc4fd7b0dcc3570bbd60bf8855de06a8725d2ee1b345242bad"; + sha512 = "2ed8460c1e972535dd0432f25ca83df290d5c9562911df111ecba32e481de72cf30564f653a00b00f8877c6cc5c2c30e6ab874aa5b3dbe6065e4488ed7ba88a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "20785e095d45c22ebab25f4a2fc224aa6e4a4b7c86db1e94a304c41598cba74ce1d1200effd78bd185e5bc90a11bb66f223e28c0cc65d6663229bb724ad1c791"; + sha512 = "b7c1ccc3a45fd41481af46d6a00ffa7b2cbc2855138d958e65cd95712800d43a5fcf7092de4c79cfa98bec3c64504ea521aebd12b712d0ec71a8d987aab871b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e070625687172f84d1d5d82ec2ef385291a60c2bf011a4a075892413ded629ac16b7688d2ccc698ace07cde309e782a1b7b16707bc42d2b47ef9394a0deb6872"; + sha512 = "37df705938723ab60166634ca6c781e1b46336e8d076655c2c3fc58d7c1d142ca74b8500bc19ef8b7a2fe84d59f3600371c7e1ea6a445429aebc274177afe601"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "38df16c7aa84fe2cfbff1e19e702b2c1ea4e2c5f1523cd3094144685fa1d5d561e00270881d0a113b14e926f540b25ceeb1562ecf4876cc35cd93fb794de448c"; + sha512 = "9b1efa7dfce319ddeac50c6dd732203ca5e1dec1cecfb1c2fe817d1711ed4821d8afb84b7ed4d7056a625fa08909884a08740b955cbcca696459b4c5753eaf03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e9846b81293eef5d593eb5175d9d73b7a42de7316c23251d94015da0554ec15981932fcbade6a5fcd726f6a89c6db461564f7ab9351342b9c4d8d915eb768219"; + sha512 = "5cc23cefe43ec331472d25b276e2b23043c36ea27b53f574a6d159c896976c8f188933b5dc830fb172b499e9f0d371023c588eb3be72ae4d52cdf6683664101f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "53cc5276c35d94f263cdb4ee4a92dbbd356eeff382c2a69dba006f6b5a3ce022c528b4e6102374b97c618e70ef7ad692b1799f6ee3987b26378b742c18145cac"; + sha512 = "a8df584f07439b1d0e76e9cef7f7017a32531039a9ca57c35a444b06ab67aa6aa7727b42a16b8ab1567dcfc60a75cabcaf96a3dfbfbc2d7f2d338bbf2037b80a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "2b0e15a85f5d9a7fe6e8ac198c86d3746d880f96ec13f8e78d69d4618d86e73f76e64bc8dca214a73f2ed95a12ba674f57c697e54f0b869760129176dfae14fa"; + sha512 = "3738b5a31f81615c013bd0b917ab9d31348338e371303794f133297dc17a32fa5be5d1d61a57f3a6b6103fcf8c34614eee3a2bca45114271a7bab7f03ae7665c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "c751b4ec0567c5fdcf3b8660ab7bf100366b9c819f78c957c79f217a0e7658d1a7c4bd141baced6e7ba36596a8c07c89b825ade20becf380249d90e0517e1096"; + sha512 = "e9efda879e66d1ed364075db1ffa11ddc1db4860de17d4c90c5586e33b716541af3e7c4716c98becd01809bab85444e933de877aef7714edf3b4fcad4fa61ed4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d556386436ad4c226f0986500de244a2efc5cf57ac8d792f328616deabb5884cbd3127d0530add7f7a9dc5c2ac61512456abecd6b1cb8c84c74b2d2bf18d9113"; + sha512 = "c46aacefe49d734ffb9dd885053c45102b4d8ac89b0babb45ca3bdf555ef854ea41580e59c3a2a3947300d15f273fe3f71aaaf6b05b74c0a67f3a8c1ab820c4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "1fdfea27dd45fbec3727804c49c8db28e624e8240a8589d28621b4f03ca12d184395632db2f629032eebbcd6f0d0f514eb3944d60c2b54bef3c187e06b9add92"; + sha512 = "b17c0aff399b62ea56cf5e546ea07637156ca631dde0da47a0a52e55ed8d097d1611c4f1571c232ff256e1092496f601e224ef20e9aa0b03f42643fabb5b7a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fc171dc5fad703344d0ec1a9d1800650d0469b1d4f10533e102031c776aaf14d5df7b9375a73583112b9bbd1d1e7df267873da0cb3e7937f5473b2d4652f19d5"; + sha512 = "dab6654be6f4f6bbdd199151375b92428f2720ea69a861198d233af27ee1bdb822a5890d0cbb5841456a1db3a8691e85cfad86272b61439dd7c2cdbfb32531ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7d8f9c31417bb03d02278c5567eff23d07cc2d9de93a5874938db0108c8c0eca0c0e3f924eb8d9887b14d7c058bf4b4fbe1aee1925f0a150212e76e11a0b587c"; + sha512 = "76bdd88222fa792374cea43ccd8454042937c99738b0ebe79aca175256df29a7a8c235c290a1bb408d603ca57ff2efe13d3571a526d5e5b542ca6f9b7560097b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "95b43192a707943cda58d98fba2bbb96b745d6997932113c1807f12de7fe3fe165c9dff7c000dafdf21192b24eaa42c874f068e3cef6a2e7c6cabb8f0e1fcc32"; + sha512 = "0cca4ce5f283ebee0d5c0632cf9c951c1f29eadc84f1cfb91ece7edc47da56412e9918d3636d21c5d78993d8a9382c8691710bf03a68482e792bcebd10713bb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3e379c3389fe3a1a97dd3d6ad39abca49273e6e36bfcc9b5b6b2eda948529bf6e744fb9550b89edce2d9ea9145a2c7a0a5d9466f2975d4c2193696871b32ec58"; + sha512 = "4c80a265ab9869fc20dd5abb07e301de954f24acb870c994e100db0f27ebf32b0f55ba10e954269cfc67e39fe1bef73575410331a941b4e0cb465e082954fabf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a1b6197535661193818b0ece5d28112073fa03824aa4bf4de999b554acf751da7117b073c875c7b2265b05af0bbbba7307b59c0f4ea02258e7ed438bc6e0bfaa"; + sha512 = "4cf191a8511cc954077698ba057f29390cea82fa3bc0a774db8a767a8d9139bd481bb8c37ea8083d1d5da2492c2404de3f837f5508238bf3325c7aadc63815bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "28927abe6b2e33868c37473378b5915ca325ab26e87b6c83566cf9a6974eef28a1ff1a800c164d2d79d613ab1482c0e563597aba20de2179b8645e8dfc5b40d0"; + sha512 = "c86ad85cbff328e4f213e25217348acd4fa45ae531da88d9282f611778d9effea05c25648cdfcd0ce3381d5124ce9f3d7b61c815a4074fddf89c713f9c8a25c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "07e3f102f8324d3b613c972651b80f83575129a3d23fddea3d02d3880bb66d3697c1d7c9cb47fb2b8dfb24acb4bf9029080675a5295d3ea1d2f7b31114ce4d13"; + sha512 = "4b05b4e17c851558c38ddb474021d5f94677c44fdc9c0040e2a575bc44af4952ef5a47af57a00f02026d54e24443c903dc5015d0aceb112e496b77df596b3e66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "90bfbe9cd103b981413d57f74d416098ee1bb284e871bc40676fd8f8240a7fea891b4d68a079c1d23d2c62e6f84dbeddc884b4ba31e446dc59fcc4d1b3422469"; + sha512 = "4c11b960a01d68c7d9c21dc7c76a495e24ef22e1f8e41df8dced33cd02456c8d564b1bddf9b06888f149c882fec1ca1533f9bad3fff0517b4bf6dcfd34fb6f0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a71571118b26ffb823da9723a6c84a2f10c04c4f52b0a5aa9dc6832ca008071bca761adc71b67959fad643711f1ff859b7e1093b5df8a6f26fb03b01de8c234c"; + sha512 = "88ea1cf62e9c1ca08e63820517ef8ba17c977df901e63a5c8476d0ed178d93d7ba06df55ea405262f117a8814c096897c637728401142a0964756b44ebca981a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "371d1292c4b9fb561bddfbda150eafe227f9c0c6525f5b9bc4ecb178c2768c2e837ae6f213cbf0dd4f64e16d51e56fbb0775d4df1b019587d5bb51428f21fe22"; + sha512 = "dde3e01be8ad1e3453360771dcfbadbba5d8e171308c217da456cd3e217792089a7f25e7a320d80ea2f81c658191d623bc6bb52ea4c2e177335d478210f168c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2477da8f55c599acfd8091a420885f795841f55bb7a0b399c2dfa51db860d9ef03626cf62c6ed99c7c89d7549d1d0b5053c44580894d0c896169fc23dd2568e0"; + sha512 = "409fd20d41998df4e86e2a42f2054eea525fcdd47256e97958b8fce4d483ee2e35317c36f91aeaf9f597df0d62cb84204ee1822a099f1ffaa3995dc02d9606c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "b9849c5d545c40bdcb7bae8d5e3447894a7637d59b1b413f7a42f9fbfe3509a45afb03b20bbee3ce1a625a08404f903a1b79bde183f51b043326d560794e501b"; + sha512 = "1adb25e8e9bb44ec79f030c789bbdadb2c2711c9cf89de6341cc0b7590da0327d865c90fb9633651246431ee8f2b80e90f58f67692595f26cb53c56c6a7a2d50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f5c014f18422c09f96d63efbd1dd3cd5e880ee5f4c1cb6a2a0eaf939a755a952ace065237b74ed8c4e70508062f69ec545d24aa55b21416cbdc449e840e8bdb9"; + sha512 = "cfa3be244a4853dcabe6e34f0fe8dbc2d940ccb89ce92174f6d382574445e1debaf66bda9760752a15f4db74d017c9d277f6a865d32f459c9c9caa9ed908813c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e35e1d007c0f1371fa4e95ea6498a87949f9f0fde93dbc960f44ad14fb8f2d4587a08fd456bd6898ba864153344a2ac8093f45264d7305a5db88fc920a8e79db"; + sha512 = "09683ea1dba929c74372c15b943c5609015c88a77b578d7f3e68bd9cf94252cc9289280fe8c5d93315551cf662460653d475d64ab7d3c188e4c89b47ffd23c21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "cc8740fd82ca6cb4aff2a5bb2bcc02d6d3457cf7f10c619b087c94d278f79a80da26a7f5f5a995fd77915c95789e1d263feec9bf1b52a9e511835565861e0bdd"; + sha512 = "ccc6bbb0513f4dd8df91bf09f58bcb2f75de28f0a33da70bc6bc688f409651ab1a34d88f0752eb30afa450cb412e34e015cba8aec7cfbdb62dcb46ed2bcfed10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7547c1099276b4683012cf286482f37af3d8e3c0afa6f95aff2e2030b7ef81c5accb4116ea178134c916f9ff09cf9aebee30c0a698c8f88cdac6f91af64ee66c"; + sha512 = "d5ae8e88f143ada1ba42a90c0ee2d20655204a6521fcd8e5e286d666e5e7203ccf7c5dde52df5e18ae8fd55def74a4a2a8bdcbe681a7addcdda3bc026117e2ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ff3db0fa7c76764d836b94b7a8e7028a2c3f39c6a3340e90cd1396564bcbf9540b9adb9b235206146c3fde2b8845968817e5eb34095aa5d27cf5ce7cff885504"; + sha512 = "8e7d166d15f00b71be942987f964ff03499efd677fafd58d6c607b53fabd866c7666228604c461252a6d30b417d31494625fa829e3947d67069769eb2bff5c1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c13fde2cc3d39d87203239e442feeeb9caa7a0fa03fa1b98f7c49eddf79ed60b88fcd4ceaf5a3d70fd48b64270ee770bc03bf0bc4fbda15fa72090d0e0b3ce03"; + sha512 = "2cdc4caa3377dca66e72cb925ceb201c2726e814aa12873d74aa2daba8c5546a649c5c2fa5e953bcf6265d642bd0b7fd5df3e7ad181190bbec0b5a626eb8ff89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "e688ecdbcbdab4a821ca17aaae031874c454b8e78cda40ab8d2ac8258a71730c656c6ea5e8542fe3bba975f8203c63bbc82a45f47a4af4da606a446a5a9c0d75"; + sha512 = "d7ec91a65762419d7ce8e7d3fdbd19675b19e8441fb36f2927d89eb1e7143a3797846fbca1ebb0a5c78a7fa8401f09a0be445eba159e1ccd722e0a4523201675"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "72d6977d4709f04b282301b6f1b803e924f1b1f1b6488b871206cb323457c9cfc01d0a683dc24b3cb16b26d160271d4f234e5f8308f01cb7c8183059e3036415"; + sha512 = "0cc5216e10d54635b13686bcacb59693150e94b9d2aca544ab077860a1d51554d86dffe38b6430bbc722b66335cbfbef878068e56b2464b5e3f76d96454eda21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "380bb6c5e7dba01547fc64e10e20234e571ea1aab0dff8ef8fba971a25038ea99694e235269321b38b346872314d64bc31529aae8623cd21c934dfdf82f2f87f"; + sha512 = "05f4b6419eedd96b327d2d50da249a699ca5bbfeb42fc5dc58c20a87e30280f99dbca8aa4eb803306abc7eb02f42a2bdbd2dd96e5553f21e289ce5e9cf83c58b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "12cbea767896b7e20b0c717666b87d7de9f6f818c4f35920d5a0eaf847fc6fd29911d1e8f3cd8bced453e38493359f4e3e644d9c1d92e91285caf9e9b8e75cdd"; + sha512 = "59a093c20ef9afb1a25d0b7453c532558209abcbbdf10dfd20c4dde8a642ca4d7c4cbad912756b44565ab9d85b5bb33750e5d8c4636feea7b8a64576edeb5220"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3be7d341d036d4899dccaa6a92fdf117a46a441b4eb481b65f8a94e32b15f5d98662a4bd5ac0c45985142027af811cfa0bed9ea1d7d1ec45439df5b9b6210be2"; + sha512 = "676e9384493d7c93a3b87031fee59282c51d0325374e989c7a505f4fff7e8830fd47b972008005566c8bab81b3b1cebc24540b4e886d2d9e23e7999edd8fb373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "67f9ae05aef3eb743559401bfe1abe662f748ac11f788fe1407b9d77f6fc2974e8e4ca9e107d2b9500e01283f07a06d35dcd7a1a7223c92e09aa38022e077b88"; + sha512 = "28bb39d6a8d6dd5748488f950a768e7993758860a6f1ca9e4faac044b3bec6e243fb24bdbeb650139f55105690e50c4415122408e5d3fdf5a491229356c0d726"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e529d48adce27340bafa07dfd7da2b6eef3559ba2caf2be59fc953028b48c3ead9974632ceaa1ae1a3c6983d2bd7a0b3beb094e8aa0cb5bb28a9e4166a8c50b4"; + sha512 = "24ff512326db7e876b3c809163495414861ccce2498a61c4408e5712b21fb6be140230c2ee3c2c66925dcc2d6a9a554361df298e682c650758e116a6a8cf55db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "35fbee4fe54f18627a647a610b178a5387428375ce743c8c91caf24ebcd37062183dd8d64b090925343e77530a0dd3a384ed5e4b2f8bccf9eba2815213721a46"; + sha512 = "2c8fcdd6232a0b143e353a243df3d204209456f26a36e137801ce6b47b18c71b9b189416f7b6d42b9b728b573c390912b9e4b02a39f97bf48d73aa930035f01e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5298adaa040804ae5311da123475f746beb2890406c47d0a15d530ad1754f78fd695c0355b3709e7416537dc1965ea8d714feb12865d183788f0962104a169e7"; + sha512 = "72879c15689e0af10799c91bdaea23393830edef94cc6d7c339080a519fce2bcae61d5ca213e3dc1d7d3692f17fa86e009fc7b090af6bfb7b2a91e00853347bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0729b8a96b8cb56b2e57fe29355792b70ba253aa1bcc34e13aa6f8c1e63358c9b315c2193c3f72ed40f47544c14f2f05768a293270bd07a2b735af9bb000ab5e"; + sha512 = "d117382ac21895542da8a3f5cd713715a8ac1f4b24e7ca96c24a79301a9af0be683c7d95f761cc4534a7ce71bb9fab94a766dd0e1f135789e0fd834910a65f06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4df76c0efd75cb75da4756add7a95dfba2a8a2834c90639687e4a963072e30d22dfeb4e9f5cfd4ea471bf97926844e561a2043423957baa1d60a64b9f1d152ec"; + sha512 = "32375c57103208e9f62d91c17799692ff5cfa675c338517a18f04aca6fe9846e768f334560591996ec225ede29fe74a8293eb2a61f7ed4ee3bfdb0238cdb354e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "7d44c52fd2b384a6212e3a5ad11ab1523d0689a61562b05fcbfd7578e47fa39368bc1fd605bc6f4a27a382f4a62bb5301a103a5cdee7e5f8353596e80edf3723"; + sha512 = "4ebc73c69b461bd5aeea6016f73cf7be4277e0bf15b21f950e219fd83ceb9deb2d950aec0bbe8dc95799756e892ffc97149116ecf78e6e28aeefbf090a894ee6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "953f22af390aeb1f13a10a47003f0f97051e83d3cd0a8f30fc9e3f7e99b82519da6ce0afdfae5f89e88b6bd017af858010aab624e1de8ab39ff9787b9d804dc3"; + sha512 = "095187047fb6336cfb2be22d65b65ae6675661a6a806eb24124025af62df741e004c93406e2dd2a130cea1fd9f97168b296329d5803b13e0d9f7a8c1fe032fab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4cde6ff0a032c6c222e2f36e33398d6acf72b0e944d9d9b6c75c34893082fe3847ac87e837848b3866e55819fed1f41c0a1807ea2c2dcd264f793df9548a5ec0"; + sha512 = "bfaed831a5d4f68318cfef05ef0b19611409c4712fc41d62176684b322811055802103b0c0062e88218d3aff5beeb395b3e0531dd086934bb19aaa662e0360dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d6ffcad6fdfdaadef0b8225f30d9d0a80e7f918d6b2ff6468f4e460643034286cd561dd63391f79c3b32222d783c09842fe4979c6d94dfce4ebab41fcc6580be"; + sha512 = "2cf29ac5eb6923092a42cecdef22d399101eac90bdf0e587d608ad03ad10a840068efd71e93e1b940960c83c901cf21ef8adcc43616a59adca94aa507cf5dff2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "8814f08d6d26a05e7f003280a0272886a44fcf3b88da93d0088f0d2a9e517c34c264229ad8ccea8efdf15247631e3cd28f82b589afc4d2d3973127e1227c6c67"; + sha512 = "3359db005fe95e03b91c313867823dace52fcd3919370cff910802f64083a22faa0e17d68c64432985b5acb086cad50fb7f92f176529d8ed213d5e7290638f23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b80fdf0b0ac0f8decc7e4329a23f8ee1005aecc70f7d0d8a000eade3d406221ffff8015beb99c77403f903487ec71870dafa92003aca86f5b0cfdd8ee1f297eb"; + sha512 = "2a50c3cd3b0a56c22e07395835dd2d3e89e0adbc43f6db42dc3c837d08c5c5dbad6b3f66a3942c215a7b889046aea7d2143b0afbb2b5ecab62dfb4e9511ddc48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "63b69aae0a219ad993e557d7125cf91ccbe8a19310a17a09536d5c2a80e7f3292e3aace28342a4b8eb73042ac2ce5d728af5a745416b4b6401d29fae95c7f9ed"; + sha512 = "57e11ba5a7815dceb0d14fae9b89fe4525e2574fbc7595a3d211b7f85c6dbb5c2cace919a58229168540c68301bcb3778e53699457d81ab5b2be1a920d0b4150"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "18ddb3ff53baf7efd11ccb432d87dcb7a89260c080f29691785bd44999a43e8f9fed99b636b26bd21e557921b82ad9e69d729c498bfcb45077adcfedcc3208fa"; + sha512 = "d61260e8310e4dacc0db02b09dd3e5259120ef6087b718daebe949edd0ca19dc58a2a7fb80d0918026723d07d6ed61fce4f76de2c5b2b6fabff6c0997d3aeaf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "2164dc4beed74c24bd3015d9d294ff0361bd5912728fb64854ce5146188414d4e8402d4ba88ac20944e499e24be103853b4820433a99d6aa8e4e48bed5b3abcc"; + sha512 = "56b89b7da88988d8786b41ed8ca92a88b27f3ef6f1bd11930704b6a1c4b1a385d7ea89c647e9419e18be6e7f312e8141f8a91680f3c318cc3262a24c1564112d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "476e3031b7a850cd52f2f20ec712b1fd0f4f55dc74ac10985c5957ab74b303b1eb4cb00ed1303a820ad4a6cea1729d282794e9b8f6b425280a05b413d86f8975"; + sha512 = "9437e094beb55548663a12ffa9185f6a221b3d181aec779818da786ecb6a2127530b28443e0d27f92512417fe6bb775376291261706932baf4b098d4b2af4a40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "25d07f7f5013a1bd7de9bf977a1b16d193446e0003000362073d26f982139ff8bf0d17990173e77b40a808f845fd590543b7ef1de5a41d3bacc9491438d4aa36"; + sha512 = "6f489ca999a25af54759eeb46cfc47984cf824257256148abb058b442c50c32fa1d2395ca6222ae20ca12f49363f7c99693edbf01247dfafea3be034e19855d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "131dc61a6c8a07c593e304cb5c1c887794a597a3ed98ccee1188081da0002bb2ea29a946b12fce1ac7287c5df74864bd881e9f99c2c485b2fbf7684196489248"; + sha512 = "a367ae72ffb53e3cbd3bcbe648c5eacae9b360bf2f53070343ef72a18af28b858a1f0a65dd0004f71e9daa05705f5d915d9d3ef1ed863470be4d7074ca078ced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "115698e54318f4107c565337c266109925310d79cfd2f1908fd5a6114128ffe827e8e81db630665907a942300664af2ece8cb6888be80f009d6fc2d8d065cdd3"; + sha512 = "d18e1ea82f688a95b0c52b88e5cef69d49c0ff57b60a44aa8e2244591bd6e7663a7642246c6f21f53a5a4620e4d01ff86af4ae155b6312aac05e612d5fbe54cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b89572ed1e0620ec29a762e49394ebaebc98ec964a9d98e8896927eda35155403883e734880ffed51d13405641c569085824ec36356cb2c3e8d57090b5f0301a"; + sha512 = "f27e68805b72906d39016588d4296b6a59089a2f69531efac383219f53fc1e9c8a45e875d9939fb9aefc971ca6f9cacc85b477d9b8e21c5fc9e6a58bdb086088"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "4a62b79d27361b324269488d1dceb4405f469d8e9a5f4764cf46a2ca31561d759e3f63ba5c23b21b45a43e07181aabd06f01aa699b04b9d1b75f0ca338e161c1"; + sha512 = "2f211b812c5325a7a59518fec88f6c497977068600d9492263cb5e0427d2aa58a3eb5423b42747bdc88566df30b8ae68fbbb5accb799893b5f9a939dd8f55047"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "d8407d6930a11e73e1338e13f980f7575df5233dccd633625175c21387c5c697c5ad3fca95db99d52b50248b257586145fac8d57ddcab8d4bb7dc97dd7dc6dbb"; + sha512 = "ca396a60641ef8694ab59753279b5770c264eb2cb25712b939cacb0f1ae6631e36ccb33f714e69dcf18cd935e1e02c6da0b064359461f8c7aa1fb322010cf31c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "1e963bf3f340dba469ae928d87fae73c112be3d8df0bd5b0667c5d7ba3a140d919b96bee2cb1a40a235bc1b80a174ba8a8615dc4ffcfad156fe87e1da2ab0fed"; + sha512 = "0ca1a0febeda1e04ec3384dedffa72f731b18a6fb4b2345169d90f746c3560feaa59808da8ae7afc1ed0f08b3db6c38940df63574e1aa662ad493792bb71ce46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "60c29bd2eb3a4abb984d495ac7e1679a66e951022b975b57ce1f5c23db3f2c43363f22626842d0a2750b7275ddb711f7ff868ddb209d37f3d790460169c5ac29"; + sha512 = "b4c640bc03720e2c8147b3ccabd2e0c7b493cf9f06d6a11d2f45812b33c7d066d4788aa90e6b3e2d84b7a7618db5584c97e8097541c45f74e76f9e7a01d1d516"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "de2c7b09e0973a6b2c86bda0f5fe2a5e29b4a18fdb53cd73301a135fef2212c0fc792c532dda5131cc9a1ee2b097e9a40d5ff4fa4e07f8b640422f9bd2e14490"; + sha512 = "f13fc2bd42de9cbaab6a2ada2bcf8c27e277682ac57bead92a69e5c5824525832dd1e2f73aba3b1534110243dd11f9d95e3dead358211bc25e008dd09485f10e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2a999ee49e7152227bcc18fcb0c17047df73b27c6330eba701ce12c4283dcd7643d824310cde1bf7571da403e3d3e9db8c34ec04ece7a3e72aa55a8e21da483a"; + sha512 = "5687c96c22796a75da37efc565a0652a0f1e2f470cc55898c5aba6bd399f4dc8a9097682fea2e2a1037bd6e100f3ad7d869b061a24c78fbd4e5db7eb6d938b4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c62b8aefcd8b5fe59d0e2e643a73b0f6e4c8e6334ba5c223d44e14bead88e81f3622b717afb5af24b7f3d668852572942d555e5a38a577c242534d4328269b68"; + sha512 = "a5a75325e98a510c506e056f6e1096ad8d0a7f4788ccae27092f407058a17aa15a34eb600820a723b4266cbb0874c90d6c9dae9cdbc414611673c79f65b443cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c0738d209d9686dbd28e8219fbb40d497ee418450210613749355c57a64578b5591a78f38b78bd3dc2d838e65738ae91d6c69a13d9eeff5e2721be46e7ebd66f"; + sha512 = "a79f703d41ca518ecb31d6dfafd776106ec7d3423f9041507770f41018cedfa71fd6315b2144e2bea4c49d83c0bcbe9cd5c57e4afcf30e04884eda252eb067eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "925db7b71d25a8e1c5485c92a4c0ba420d541a5c8c919bfd55a7a40357e83ee9728488bfc38eab789ff205513110f6c8f5894ec02d9fc5f47f9ae829a34a71d9"; + sha512 = "fe1a0700221b22afc1cbcdf7d726941b80be80d96ded4342cba4c9d54a0c6c8b155a879215e5f83d19471bc306cb2311bb731337ba260d0c7d537f9406ed0da0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c718cee842c5bd456282b1daa7b697a7a1bd5eb63108a5ff63dc4dc8f4ce67fcf0b433e65b6128877636f8a2bcfb469d7340052a9347d3b43ab5d87c03b82b38"; + sha512 = "6cc3966907c92b9e0fcde5adc6e107782e5857958514206b4c25859491f1d864cc2a1ae747d0fe8ebb7813a929ce73b3e66f18cc139b661eaec2456086aa98d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fb650b4ad152cf230c23a4c849671e2fc96982d01785261ac643375e51eda259a9ac725d668b6d7fb50d3db14e7a2dc26babe208774a37444ee25eedaeb8b414"; + sha512 = "18fd6dd3d3af822e71499a6517517b5a0e3a71b92883e37f668c2311e5a4b56bde0ceb2685e947ae2edcd8c481a3c3308cf5d3b5d8f0da92107e074614943a05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f2fb270f51fe996b829e1d49bfed793ab6ef61bccedcc6f3cedf02b2a50aa214e2942c9f90676f3339de8aac977b561879376513c0815e1157c510ecad29f2d9"; + sha512 = "8e7ff27ba8b2205691c280e0e61e20dc67a00f37b7c5a40b1619179f1747aa76d37551b4d3d10323d521c815b01082685395dc8d93fcb8fe39de8dc2a12df917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "533bcb8ce4d54fec85f0c74e04c6ab6635ccdc462bbd80771919700220e2fa48a12e1d5afa684a2cf4d00bd892fb3ccf219dd288926a16c13eb79dd64b9c7bcf"; + sha512 = "6470e39996855fbc7415b637965ddd954d7e8fe38230c5c9d5c7838f9a945d52f03aafce1015c30ce03b8eb49b6dea2f974068518fdb818213b91100cb98eac8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d0e3d28147a6ef4e33b25790c9c205016d7495c0342221dbe3e3c56cc7de34c8fb4f319fcc8ca39fe14365c2ebc44bef4571e42b9254b6f093ec3eaf4e28b3aa"; + sha512 = "b900a63c29c0d8251419eb87b700392ac3504fa49ccc732d181a63cc7b5a3c26f0480b64348823f0e6dec6beab126c3c610351abfcc3af5bed85cd655057cf5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "a883303cf4805a251344be37563ceb16197fe41c5120f549449e507383b0737bf8a7ffab58cce6c13e57432e4c452a8cea8abfe4e776cf962436621f16ab1692"; + sha512 = "867a9ee9ad08b33936cda12edac4de00e1c5b27534ba65a0f16ceb72b2713b1efcaf31c058abe1a64f296e3af2554a9f4c38337214a4f503552dd3174d6d6513"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9b2cefd313e9bed5d21dd937c6427313cb186f268449521af18bb48077f241f2c7fcc2a62145287dbcc9ad3e6532beb46a58fe3a05c195ece2eb5c2b9be9a76c"; + sha512 = "0d65e598adde1f32a52250701f511993789c5ac9e68448fa5c7041a58714d2684617cdce37f578a5d2a498ea09a35af814d5b06871b0ae9bec8a71bec8bbbb7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6da0c24c43ae42e1ee778ce6f190b3159824d16b9072f72af13b9a33e43bc08551b66e7f0f6f101c2845bbd8bc0b88603390205888b640a01c36a61925eddf35"; + sha512 = "a6495f122a2b6f07eefd8e29807155f381d1f89f3506193551fcc5d8e0f9d1943dfb5ca18debb24df965f1d1db856d6aa0dadbe98c2bc02671567573743f66d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "17ec7de363cd11814d4de5df4c88350bca1a30033f98fdcd415c408f40b34aed5c0c10cfea0d94e1a31f0325878319b7b8cfdeb787bde0e65320f4d914c7a3dd"; + sha512 = "25a81d4749c1d95e36675ce329f7ff0222a1dc324e69d01681d39e1bc751355e6928b131bc345b50517a45c2dc3a1ed03cc7e9c82d8dc3a169796b31d4470ecc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "821564902471cc3b36bc14a9f168262dee1b4e527445f93f8f8c39b7db2af71c80eb4637da2471247983c600c50ba44f6581d6fdf792ef5774fdb08bbe357aa4"; + sha512 = "ee156726a54ae37f81a1da32e2d67988b4a0afdec52505982d183d6ded497a4257b81388728e733a480726076b7d61fc020bb741d4b640b19b7d24f7b75e86e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "0757f19aab0c1b9fdc9d80e82fa5eedeb43e7302903add9b4c7f68e030de42527237d2f5d1b1b0fc7d88c3de670aef25c3014546e01783b65cc6b25fa8a75217"; + sha512 = "213541ef2037daa9a851fd7acd846da7b1a3ea8c162362f770406b653916116dab59bf939e8831a10f76ba6928a1e830258e2091811f66a7c6b9a1e4a360880f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "811815fc732896e6e90a860647152c1c9196ad7280cf7274b8d224aa5ffff6ccee1c10c127d6750c4bf5b8ccef5659eebf43241db32b516ed1f95e3d2af99a52"; + sha512 = "32d550663ea09aef0f40efb1215f1388ecdcb3f7b00e4975cfb8c85912ce3c0b31fdd657672405a95c4dbf75952f14f377e6ce7cff96c5e663d7a1b27323324a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bc07e863014d7be3a783a90b4373794ce491b57fc47ceb55382c816cd47c8b19e9b71d209217ff4af79e0b333953c4b791025e3760c7a04d7f8d2c672d9e36f3"; + sha512 = "023ddd41d19b74fc03731783ee2af94338576abdc9d5b64ef0a56cf473307241a8f6f89f2a053eb8d8ac003d5d7d70d97edacb47cd22039e9ce5b8472dfa6230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1d48c99480c0db287b4ac3b7f183a6b708b61b1ebeb542aac37133bcb3dce61aaa2ab38b4fcf08130ca068c79494f6e1896ed3f0d26d88ee364f5c48842d8ddd"; + sha512 = "4e5cdd14e31d280ee1d7b19e0b21571e2ce509f367daa34b83ec903d978ad460b0aab82da748eaaa8e1a01b6a2c5bbdd5c53eef30bf486bf6b5f3228cc4cf5a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "ae2c95bcd342bf2362266e460cc6303653771926789cf3ae689bbef6bb4d59c24baa3537329315ecf91d7a483f1f97a961049c2e866112978602096470cd28d0"; + sha512 = "5800be044bab8e785288f26124b03fcca04b9583c4ac98add9679a57d427a92f3b7d77da045e845da581d9ed03c46217baee12cb9d336634881a5cff2aee169e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6c349ead6a53f417bb693dce2fc06664796a1781ec78a38e4b2df72505808cc63fdb5629a9264c9bc93c3a8f61be6a832b42a0a1ae56c38e064c61d105ecc09e"; + sha512 = "e62b9ea730f9972b7dbd32351a3b04f42f28cc22fac3021678880e206a0d1e7f0a2300cede9d7f1caf3d36539e40aa6c9f7b801dc89c79860d8253a12e22fc70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "df4a98d33d15d1e4cd8fef2f5ef80c8db43a47c7715c4f5ef8c3a8e3afa7515193557c5a779dbd93b905ede42563d6c266506dc881bae5b534dd2f5d091f593f"; + sha512 = "8d629e2507fced857b5845ee1d9a191e2e9a4931d5eaeec4bbf2aa61d242db053753491e9bf196b7a2ac6a9ed85feddbff3044ffa33487109ec7ef4356c4c184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "853dd4a017b7f53b32c08a3984ab3e0584ea461e3fccf18fafaa461ca07fa40450d248c9b5df38800c8978d2d74b024861ab11e385b6edd99fe6637c2af6fe1b"; + sha512 = "5f544dff7a5c450ca05518d41d4da8aad54425118422b59899111018b8e0f74e51b4aaf1b98d0bc7cac433be7b4a45bb6ac60cde1b32bfeb68119b87d929b33f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "76f72bb1563001978c39de8b44a01167d1c8a4bbef7d6fa34f2f904ca039ccb00534e4856413fceb0e49d2afaba06d40ba7b92c8c2cf9cdf55412755dfd8382a"; + sha512 = "fa604356e44f2ebbc2192accd634f4ca17f602ddb5b9581d023c69988752d2f9a1b33173bf84a101f797bf99c8bcf6a7e34c6f53982fad2d419956539cf56363"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "df08afbc8bfa7d82d9ea2e5e212494198270cf9f401aeab34d31cd36df8311f92d8cba0cdf46d6f82afec42897a3ddbee0d949d73a17ae962efcee72be728d3e"; + sha512 = "b9c60aa1bd66d9f0f56a260aed3fbeedf2216aaba539246c631f46c5fb3a23a8129360100b37387cc312acfb118d59a4e3bfa17555a57b00f1f233ef97f3bd5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9dcefe6cd21b403bf51a54addcbc4776db92aa1e722f592ed5bc2cb39a52a1255c88134500ae0905193dadec89147ff7bf95499180678177e29fc872bb71e5cd"; + sha512 = "e4f149c83e67432aa31d9ab91c50208828069e49df69ea83ee4b3c281bcbfa05dbca71f678725bc41ae044098b9e4d61ca2a13188b06412ea58845739f76403a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ec5a3058b71d81c2e30804942d8d39ecb2ed4f8cf801c0464993b4521ad5992dc9c6bc2aaa63b646f7202a19a4243e37f32e1af095827a63d7ec044e9c47754d"; + sha512 = "6c4fb2984588621effe18a159ec17e1c04a95bda869be2d8498afe07c29e461d0f95c84f2959169b10d728cf3bb62d2c6ea05f794292953ae8c07c831051d1ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "814de6c9e194b42d2d4b6f5f1c0b88d5bba4f64f92a4819f8fead0c3806c52a3b9d8bcafb11c02abaab6a37253fa27efefba5133587e60ec25b76c94a004fa35"; + sha512 = "18ba0661a6d63004ad92df206aafe3215f50e26e91aebc3b68fea238aef4c0b8756cbef9a6b2078aeb5ca0b38de8a1988ff548f7e3c5d8ac41b85eeaad88a911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ba5afe64785c45fcbc7577e519bd996dbc324cf1da87f0e3044db968f9e67d16cf2958346ece84b57bf34775b05f27cecdb6043bd09bbd594dbbc277624787ac"; + sha512 = "53859553180c85021ad156ba21a7a24d4907d4766646689f7f1835e4c3f4f5235cf0148363b0c2478028c3443510ef34fd09b03ec70c21b7328ee5a61f0e1c99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "fdf9cefa473363a7bd7027b05f412a260aa69742743cd121900f1bc5f2ca45c45011d068a6db01b6c5849d53719beefa4da659aadf7116e9c2b17ea251188586"; + sha512 = "e76e4fa8a48dda9e2305a9e5e774559e46199b2849ddda8e14bfd07af7c5a1281615bdb743e2492ff7efdea66d9b8f2ed2ebfb28920cef7262fff16178f596fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f6236d368e813b3aa88847cea48510be3c2be2fb7ff054eff0c1458205db70f645d83f6ef20285f774686ade01f58751cb082fdb2dd632511089ef2c63209253"; + sha512 = "509c28c1cec65d471255c79175a9b79c9967beb0b2b772bf0b3417bbd39b2d4fb8cefac5e06d7658395c2770bd6384ffc85c73e5939901b51c9aa049e7b4c506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "74658505a2462cfd26032a837db50bcdd092a927f8f8427bfa3182301f25a15da346091d73689ffcb0c0e7c59b154da343b7be917e1ef4e1761948bbfe1bcc7b"; + sha512 = "a481453b0f458fcca2fb622ddcaade281f12c6e89f66f7b6e444c1a63c79265c49b020a67f24d28319d3a46606b49dc6ce8789b638604afdf618e28ad6bfac4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c168ac1509e7fcd3715b8f1eea47c64999028256b442f11ebfacb7809d61553f251fb1e3fb80bbe4050c7fd0371e6f1a417b7fcb3eeefdd0b2e30e547da3b8a9"; + sha512 = "11aba32937132635c0334f7760c3232181d20f6bf972d665ba59baa5a3d72572693a36067e5513fa89ca2a911f81882e23a854d088369ed4ff6a146c6d743b79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a2440702f8382ff965b17641e9d9dbc6cfb4d536427f92f51a3b8df63ae61ec869760d6eaa38202a7f19acc0ebd6895f1c57a27a5ece8bd1f6a29781d5a298da"; + sha512 = "06cc5f9bf807340548e63fe3b32ea142dff202daeb843d6cd1677c6f61459a9225d8736f0e071b598760e366de50dfea2659ef875fa5ecf4071f92a01587ea29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "c1aa573de2ed71b85392bff6b8c9279633a142ce51bc26e690c02ed059f6f7db47cdde3fecff902617d27fecca1824b8ebad1b10a7889b918de2056991921c76"; + sha512 = "8f8973f321231fc8f2a4a1e5dafd7960fb34c3fe3b66d9bccf449a182ac108b29bf1bb2d04fabea44bcb8a9c4ce4ff0b870df2f40a3282e8384e3371ce56f496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a728779adf7644f3fe8363080d93a8180ef2ba09fb78f0d05989fa57585f77897757c5b587a318886eb54d805ee8de625c7cbee44908badc14b47dfbe2dd2885"; + sha512 = "87bcd40a4093a822346f2d2241eda1877764246171766be07b32be4bcf5b7640e438b19f9b1e2243c2658c7e4f176c28c9ef115d813b5149d384f0e5c966accd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5bf79cb726263b8aab120c6b826a09524594bfd8ab7c6464937d23f02e866e353cf8ce71adc8dcb621d6df71e4e7d9dc8d60eeba4023cc3d7c8358eae2058d40"; + sha512 = "002fa901689602a3adb01070a5ea8f30e306aceb3f3177e52190959d72e2afdc5181fac58254dcab7d77860e46ed0e8d9f56eb74407467d147e29281dcd7ae39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "84f717ea9067ea2ae636aa15fae1821e2660c84db5c6d3f1f656d9170312b31e44abcdaa1298a29adfed9b221e72301faf2fb1253672729c7fe7ce275cf37b45"; + sha512 = "2a32074a47bf7cb67b1f35b0d20bc253a9f128c6ab6d69329cc64299476a94b20d45c878b48a571b4d37ebc667c7eda5ef91d2a0fcff104f7f08f1a1627d02bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "66a6ca250c2d916503b825c05dc108e865ef63aaa851a658198869a0fecbad3e31b7572873b2b39f53220c0c1472e30d5822700512675cc9b1df9cda782185de"; + sha512 = "7f8e5cf1872945950173d294f49911255d8bee514c5d839841503f0ce38e973ae301d69724831a4841a17c40229885e41471ed7fd0efc89704c197ccfdd7c3de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c953bde75215054be5be2364394aa89bebc4489dfd930ce1088ea770fe5b94ef9682f8a17065674dc674303a558dfbc77973c751b7e52d975b2138ba5be823cb"; + sha512 = "4284741c8a3505de74cdc7cfe903e696fb4e7ec832b08b9af89a32345d10658030bdb0219252fedb0f04f7939fcef351af9e3816584974e3e26430665767802a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d2ef4e665ce29f2df4ea9a9322962bf934b4e8eb8f2396fe532e2873a68a3d7124c53f3afafc541ac67799f01b8e75595de849a2a7d5bb7f552e0893add7ffab"; + sha512 = "19eb961a94b11a6cd49072ef0fbd0fbf243a6e66ff2115ca601ebf8b9c09e98c0a3c27086c923bada407509bb7a6e08e1163120a121c88c0ef63c4460d04f547"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e5f8b77ca5fa59d5236984e6141b909e2d232a5d279a295eee7fb83eeadf17d0078c936d2c560bdd9ce9df5809b0138547946d9052842d93e699fb7ad7161062"; + sha512 = "537a30a7fb0207c120d42b2f77ab043df3a6ef9454cd93584ff95ddfc084bf69266a9cc2efedd00b69f198eb0832daa30b805a5007d6b64eaa5fa248b4e4435a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f241d4d26266231e063bd556d07b34477eb5d93452ce29a1c0518a5414eeba3398bfba5b6113a9c7cbc7ff3dc5371cd2eb470de4a00891a97a9e8f5a6ffb6d3c"; + sha512 = "fdfcf95cbcf4f987d1c83e63189c68c856fb9b22c158693fff17038a4883e1080d41af864057c96635b1ce5c7e7260f8e40546b78be420e60a098a79252319d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "2e72ba457794ae8c40f0cc84a7f8f4ec66a2157a61853fa9ac7fb088e9320b85ca6d2b32653266dd4042b786596b9e03abdaa8f3f26157d354c070e3bd3cce52"; + sha512 = "4c0b5adf6e043ad1f1db1fc6dae2dc4bd9b081f890bb560436d16e8766582c44c2eeef2662b7ca4042f082eb7c6ff73d816ac9cc505a2b4e6dd2b960bee65fd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b3bfa0ebfe62ddaebaaa35a90e220e6092b269ade846a07f45f12ba78050ff1d9c430ae98c84467dcb4449eec93c8216aaf9046a40a74b23d289beef89c347af"; + sha512 = "c84be688e42579df606c86ddddca874c5c795dd23897f26a6755f0bd70247f9706acb204fec72529a94a32027307a4f587c8746c8765994179d99db3ef11ff3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d85b8c718e82115f1d653e4cbaa87e5713dbf4046e7c81701b6d9f7d7d3020142de5ff181bb3a46916a65954a743716f0b2898d098b8b582a14703a7a0169abd"; + sha512 = "39dcd7bc909dad0b661f2e0fb9bf34d24ec96b10e3ffa645ff59cfb431e303223ed0de999184de3ec731a500aabeb869d2c1e12b67868ac1ac71f2451f192cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ad456cf1fb209f0a7f3f567fb79684657074eaf9f40bfe46716e52c482fd3f6e63cd4ff2bccf9d47a2a70d59c02c1953ecd70eff89f95608c25caf100be31f02"; + sha512 = "20dd0f2acd16ce48cbbb54944b44e389ab6a3d0d3f37b4cb01ecebb7e6833b5006135c4a20b7f55ca4d8d4d2dddb124b06534aacccf4f2630874d46b3c5fe36c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c70393c2ff8eb5bfaefc5bb646a327f685d16ddf5e9f6839d9d064fe51b51ef12e82716dc247fe9533f97bd33641d242049d1cb09130d29bd72faf497f989bad"; + sha512 = "c31adc5dbd09f282470d16680f5f80e37ed020d1b77d394e157bdb4a29fece2edfd7dd585e4fa3231a0b2e58247702da270f728875fe9bf886a68d5eb8a48a7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6a4260b28a9d3f1bf118f4e32a64395a636395a98e0cf33546530d3439d74bcb773dd4493c9634c16f455cd7d034235d2c1f06830371033940a8cceef7a786f3"; + sha512 = "1007c55b9481d35b9611ae42a71ca0135ae65fbd9a13e61cb5a90c4698ed1854fbd4129d14e394cc605362da3b2c22fdaba5229831353831ac21f3390af06376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e0a0812ac3a24a0b9358f68a63d136b4dd0d140bd299bbc7b9b4c7a72e88c6ecbd149d1419478642b0b9bb662d625f9134febe5d6d210f9856fe99a6bd566832"; + sha512 = "3cce46878580911ac18633095cdba6b180da1dd34ebd3ea0070be8e1ba3c1200c3cf46a8e00c246c95b4efbc32182f36be12685dd5873f57227e07e6a826af92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "171772bdf3fd38225db4f1dd0321f7c47101f804d94ad6b558423761ac0a3e464ff992b23e118c2ee05e053213ebf27807413007c5dab0bd9429e6612e52acc6"; + sha512 = "9f973ab872f47ce77130482cb4e9482b16edcc0445ca7f05d6b264eac288263e97326938904b09a43081766efad4c226ef5b5150ce9e4c640ad369f416a8325b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c7f96bc59b36c6ba7c4cd1d2ad0ce4e572dd489edadd39690aadf4cbb7e4573353fd73cfff94b2defdb6923a8a23d1857ec16621130cc106bdb6000fc054f98e"; + sha512 = "d681c9d2b0a345f144c4af91b3eca2cf0e23c0fb9eacf942ba459bf1b73e4c70122b20131714a3b92d6404f455877963a80bba3e01d2d674e56fcec8f76d4346"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b4f28a2c5b303af01f1fab300a3c09554496cdae9ea15a0a6ab816411e7493a8a8fac2360e12a39be050a8de9ff2bde5bc4f6f8e0b6dc25cd8adad49a0d7514f"; + sha512 = "1d32114be5bd45bd434cbec1a7cca2877aa324d57c02e1541f0eb37d79dd786f7b55fd42b1909e3ea3d6b4a3ea849f671922b8d95bab258b6f948480fe6205b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d847c11a5f207a27221a6b022cbb78e770a6d060eeb05065bd770101bc0238c0309bf4aaa063d070e23c1e8ab8c955c4318c09215bec8184b279f653ea05838b"; + sha512 = "6ded88d5bc40b5878462fbc17a9af5e26a6b3cb05e53ef25050e24f98992e226d33a7855cd34eb1b73770e57cb9ad53bb17b9d711cdab969338c6cbb38837500"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "9a0a608abdf8040be460483ce8c291eaa5cfa5ff719ac113c03bb1092ace9017f9beb10cc78edf8a6169452f6f46169673f856dd58f6d8eb7cdb49d9378c82cd"; + sha512 = "543eb909ae6fa971023cdbffd2a312f269ceb9fa20868d83a9e63bffc9936705a85919826577ed9a286e89df4a279d8a1b123ce48247443c7fbee96457ee3c7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "ca8e503ae4c7e6e457dce0674116a9beaa6360ba50df5d97d0b56375794c940c91028bbc1424f5f7628a80560220a169c8a8ff59a3739e2555bd9b091842d7dd"; + sha512 = "84262bbb055a96332f34c6aa26b9bbad69ff9e066cbc60829ccfe5a59f64d6c11838d45ed56aa3a9129c2786abae5e9f5fdc496759d87ba3f98a7e1e7db548d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "842bf6fa0d8b6ad46a17e1f1d54207522cc6d65051138e73063fbc0c9623ef56d0861f524d441105ff606753e95a072124c3538dbf87ce333d22bdc1a448bc3f"; + sha512 = "71a95fce457d0e7f07159241df7739b5cce62fa29a53729fbf1157bdf3eef85fcb9d277b9cc66cf67d767102e7aa16c6ef1bd371787fed4af29ce620b6b5ece5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f83218ecd31e86ce402b47cd00abec4065355e64e9d884fb5aacbde86977cf8e0ead693fd939f27c735d74b8b483ec18d4b185d7023c2124993fc52109238234"; + sha512 = "f12e626f88ed3e726be24322d21f126f3f30cf0acfa5842386f51d5b7cfd222b96978910804f631bb3f5cb4eb27040b01c9326e65f61b6167e49e60d6a40afcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5d00e98297f9a9d768467c981bd789fa15945a5c70ffcb2f402f68cf13efea72106de8aa947963d58e25365d17456538e6e76c8bf4ae62f8ea5c0aef0b4d109f"; + sha512 = "f5d0a876dd4f6644af01fc53080b6126ff9f128d6ca990d0e125c4ecf04a47c770a87e1fbe6975b3262449f0d066224cf9de1964cde57d0c3d7d50b709131675"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a30c6c7d0f50cc1db0505ec34ae1d5714737305c3e8e1e1660b6f519aabb699ba2a2bb14ecb77e1deda1d30cfd50ee69de3a308be004ca6a4b9e6df50eeb94de"; + sha512 = "af9e5e2fc9bb7e84aebe8cc12098a4a3a8cc405172a7ff73cfa3c8772d8a5515dd3c5647d7d51066a0a7612553313c5a05044740f66358452ac0a8c3d6dea227"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9f3a5a32d4be8c9941293eb1d8c18968502eaa28fad44ae89df20c2170809b850a7a0460a95f6aa189c148c2c54a881ab138d12f3029f21a863c5307e4aa11e5"; + sha512 = "0851f85849651463b8a841de88e69820f101b468a706e5bb0986debee21f0d7f0abb9f52f7e89c097361a21f6fcddb4d57f17015d41b1350dfb36b00b246888f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "93547d639642d8c0ed10f23344ea01a66b43f99ecdcdd7a0e2e1a9b2a895a1fc10b44231db8c6d948a19a84b820a8dbbaa9ecec4df0bfc4555cfa62385ece6f3"; + sha512 = "b16ef7812f4f5f0cb4655ebd792ba38ba4858dd93713819a26ee9ad794d8754fe55bf6dae0bb6c371424776f9dad8c13e2449a43a1f14876ed309b2a0f9312fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "73c501b9a4a329acf953881a795444baf4291ca6dd152cc05c698f661b2ad1f979fa7f45f4cbd6abb6b79b6b41ca0079658d32c1b5cfb6dd166eff486f0ff067"; + sha512 = "e337b418317b2e7a36d265755564fd6ac6fc227d59b31410b305502d1002b4d8fac06339f2c750bd9b26cc42094c89fc4d92d89c6dcb7992545489777bbc1f29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b505c3ef839778b713c42ba61ab2616d389184e6268313537ec12e648c341c8ff57b739622ec118daaad900b54fb4f8eb57f43526f711f59f368db88f788aa51"; + sha512 = "b83ef927a63ea25990f0a6690eba195360369e751ae0db446ec093e51a5a7c187c3ff902e3deddaee9b395359db4a7edec431565af167fddfd931d97e8078752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "744247e1441b2c44cd427179e5008ec2a25bf4b6d4e3195c910e8943c76deabd63dd5ce5c5ce6de2968d5f00e67990d8fce2322d901d2a5bcba6b2fbfb4f51df"; + sha512 = "af8447042c0500fa5fb6f16f10a0550bc70fae412b5f4eb8e39fe8eceff10b22cc0b11357612ac1c06cc81fde74d9ebd2b6335c7c84c0c88e82bc6671257e8bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "1784177b07a777972dbbe14b259af9c0f5e4e8453d82ed0a9dfc7c0f548f6909cd9a986b4a03c2c40a5d1e88bcaea32c75909e5f085c652637512e8cc56ce38e"; + sha512 = "e59c323f6e4336b198f4785c1bd3d8a48577eb2c202a63c264b604ff16c2017ce43a9b05f7c0698995e9dd83278e817a056a14a5f6242065c2d50e545dd99c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7a56deb3e7014ab4ed95f70e537c1613fdbca8a0a538820f903808e8d881a7259033ec6d0c8512ee17dca4b55dd5bf54789be78a6018f6c21f5176e7d9cef09e"; + sha512 = "691faefa9a8f7ede8be09126174d8170c62c7cb670ac9373575726ea4eaaf64cfafc04312ca21e334f095b226d5d1f1dec860f6cf2e4a482adbfc22970c033ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d47f44b37418d61131cf1b804e2914b6dbfcb8bb30efa771d2d41d0e3768e20660bc4c8c3b36b1611ea3e992825cbb9548a4c3b975578d6c218fe10f743d37a2"; + sha512 = "b65f1b2ddadeab279afe964da9097211b4cc5956ceab77cc48cea5ecf6815de03ba8e89f39b5c3ba4f7915c7150b8d1951c7fccdbd7f7db71a53b732aeff7182"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8e9229d45bd3484c76fcabfa66845b41de87b33c1dafadc9a06ff6d36396cdd9a1d5d86a7e85728b9b658c39197962f20f374453c594cb92b82f0a14536522be"; + sha512 = "4eb20efa50dd34e23b08f1bd25335cb296c8d5c4ed176e7882da4e466563e31a4cc1a0c0ad0950a7a892b28000811c70c7158a7e3da26c02d05129ef13fa0566"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f656f3bbc00dd0c3c4a0a9c4a7d5d74f2049c343284b891ea455ac093f15ef24bcb4acb244213516272b730cd42798115ce3e9013cc7ac6bcd648e97aaf6ef3b"; + sha512 = "4dab2d22e41590494366c582ffe8e80a2a635dd1b7d57416e51cf0c723cbc1d40c6964a30572283aa7c6d6312c54cb97a6610877eea1b4bc989ec871316cb93b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "de412f63269b4e89bea1fc854c9a0ac9f37ef73d19ec900f32aef0fb444fb49daac0bb2e1df9ad01ec01810f64eb8f9d96d17816e7f062f5f3a324406a863efe"; + sha512 = "f321afa413c878e4ed9b80c1e7b356a70125ae3799b2b47df32a011e60908f86a27572639df10d4826922b73b6515f463a1e5e0b3d60f8c20afb8d23c18ccf88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5b6a9f82c85318e21a4a4bb44e74db28e690372d3fd93c8ad8ab4db8b1efcd9014fe365df1c95cae4ab4e7a3abde9ab4dc8873e8d9440c3a5716cce8b38407c4"; + sha512 = "d177a9a730911104761d6a7968aeb1cab62347438c5ed30099fb1fa9c9701b87562f081128062b3051ea6cc0495a58e4a8fd9b8c82d4ed7108d0bfd73da2fec1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "8a44046e7a0c0345575fd9b715dddfb88bff2cae6b674421724056e9142570b3499c645691c4c0bf37cb4ed59026a6e4827801b32fc865e6e2f9ed7653e13c30"; + sha512 = "15e665808dfbf076932d17196e93f7db271d8f948ecb060a5f41934d59d75d6e7beae2b5abbc4cd5ba86e59e493c8f41f6a316f4be6603c0ab009714fe073391"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "57dd98bc122a433f4f2bc0a07d167344087a26bc7dbf728a9d9770b61b108f953826d88889e73c2c6599fba5edfeeca3dd6eee2377faab254bd7f741ae30939b"; + sha512 = "ddc63cd63501e93c12fb687804a2d8ff7b5a4e996456e33a2d9b3531e72d9c85cd7db328ba3f7195ae5ce2b565d40fb4a6f2778ea7f6161596c3e21f5491eb13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "58e47133a1a1e018ef4eb64cf099abc7676a63d3edc86024d024ce3e95e2c007e37480dd9e015bf45fa7c53fc46f9ee95214199d25cf57dce8dbac6a56356c22"; + sha512 = "1dcebfad1e5d987626e2941eed30b5ac84dc304231b76963c062561b1784dbd6f42bc7d01c2008b32cee7868158b786cf30dae7c5c8da1a6d8a176e9a16af591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7825ff6f4f2645e4577dc472cba3e4cb0cbd8f7881671f99f48df03fd509489ae74c000705b212fd5033b7da7345b09aafd68171009f5ebc40753f7da43e36de"; + sha512 = "aef13bc353d294944df1bae358572c9a7922e8ed41a8225d987ec6b4997aa317351a7684cbba482ff1928b63d3238ee85d07198bb8cc6dbc1a2e3b0fb9c29a57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0401f4890ba1f21c7dc1139046f0aa6e218891c69de964c7e0ea32c50ace9cf743990548b6d544c8047719b189f4af4594231c2c30abc48a8dbb888c9f6ff339"; + sha512 = "5f84a47f2a22cfe759fe42b832bdec237b7cbbbcf26024a1508dc1a893172246a52e4f165d57bd082ff6780f00ff2a82fe574e4d521b29d98f0dfcc47ac152a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f54ca89091125043d38ce7a197ea2e1675cd3f308ca0f93b0d57cd1ad8e341e2f8fc41dba925c85c12947cce4cc4ebae13e248a48fe5fb229e4e06e4ed0e1436"; + sha512 = "303b4320405c301245095f0308e9b3757a502161bd43f3f6c5ea9255656dc1f394322718535887f5b3038dc0d6390483e74a6c5ff45fc28296dee3d83afc9425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c6aeb9254c51fcaaeeabb973ba7c6b7cbbdf1547300b8149abac8b35bf9d319a3d1efd7a9d252b23d6fdcfffe0f311014c17c475b27bfedc15798fdd8fa08fc1"; + sha512 = "0e9eacf033d76e672f460b7b133ce5025fda39aa4102e55199f67691bc9acf121c78c5251b9ed1e7ab49d93b83e4bdbab6bad671f39c22a490103266d09b667a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f3451dc01dad8018b4709a6af7c8829d41ee3de4e028b3529be556480e0c5a48b257dc33ada9527b88550b2f68985bb71b1fe7cb6fb84e505ef3165a58d94c1a"; + sha512 = "9b2ced81ea8deb62c0fb2a6fd3e660362ab64ae2ee706c06b6af0eb33f25df4bbe6386019cfd94f240ca4fba6e30d5ed51ad4c5b319afd76a2e5a62d6f0f023d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "3364456a57641e1bb20bc2255c0eeced49b67043eafef74867fdffb6e6abc3eeb3871159859bbd9ff4aa823f8060409db068fbe2f44a16c09ec2170a6b8f858b"; + sha512 = "1c4d3718362aff114193e92284c981a9bae5acbf956aeaf96d0ec23a3d469ddd064f5d7ee4bbe8c661bd644875f08159656e7d44949c59f91ce1a88e9404ffa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e206b0ff442462a150b60a72ed29653e64e2d277d887e622f31fddf2332cef1f75b6d6ddc27bd9c5dc89bfd87b67ce3fed72491e4d29a77809f4f901a2e87c18"; + sha512 = "bcdfd59b76db31c01ee7a69551dc5c025858daf3f71a593f1e8959c8af20227ce3240234aa94f7bd53e753bfea796a29b7f82c924396a130cd895c134ec0dd31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a0873fc6ed8c69e205d4c01783ecabbc403317d94ea7fd21077e00f8cdc264424c00e32b6dd27202b2d6ed8ac08299eb6693a38c288cf9b9a24c722745ab0eb9"; + sha512 = "207d4701dd75d5b88bf06567b13934f59de38b631683275ad7fb2bacc4c0aac62ee5acdb1520c7c4e2671b33b06fad119ebbc02d04e583bcfa732969839455c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "95183a50d86bd9463ae2ceff374c2c16d563cde9c2bd7395ac900195fc7f663239289baea37ecf9941abd0d8b43b5c63214fd40b8eade0419e2ffef2aad51095"; + sha512 = "01a29678e43e8dc04c0a0340c6fd7c723584a398e797472932792b24911d2009e0a952f4031a3f11ce7c803b4c59b8d8b934d60ef3373204019c4bccd4d44639"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "758cf8c198165c0579207ad8d67d998eaa81c32a8ddd269ce1c76a05082349cdfe38c0fd969188e7d4e86eb128b88cf88daa9e3c283820311972773b075bda10"; + sha512 = "8037052b3fc838001f3159dd64254cf36426f9d11417dbe032926c263648dc9b53f451d9add606e6ceca0ae4599ee1949d92ba8f908fe16cbfad1e1a72b60279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b38a18191221d6fdf1386c72ec07e198d10dfb2cb33bca34aa5d960f5c7be2ae61fb543409559e3308db188ec949261eac4949391f8b699f63948fe3177a2ec7"; + sha512 = "c5b2f583b8fd0cb8fad8057107663e875ccf84d53e81b2cdc32492924feb33cee1cef726e7455f316144e6cad8341e4b8b74b49ebab26de22b88a4833ea25724"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f0b09948695397b53cb3fc500d6ae47aabc4f84da9314867816e2c4f21e4228e601731756b1b87253d2a2d5f6057fa115bf667d115de5d54ef4baa1a5dc181e5"; + sha512 = "f2adaab166d20ee7b88fad7a3b9f1fbff7dbec6da77d48a44dbd4e1c74413db847cdf9b234f73fbf8cfb50426f0cb67cd7d9ea26c36566154428ec5b28770435"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "46ef2273ff40e516c9deabe4b42bbb57abbc813a6717b0ecde42720e9d54ef3b332df05f48a5db516f8030aa984bbb0d91afbe3f0b84c604f9d106c39e124bde"; + sha512 = "25f088cfc5d1fd4e52db26fc530e239765f6c25329b34fb61c54a4b7966ada5b83e476edc5d57edb9167584709d32dfb6c5f04a45262d4003f6ac3f6f5e5d345"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "43a1803e07b496571f35e005b8ba0adfd9281c9c907b00b92bd0fcf37e9b4c8236af90d145456725feaf3ef2c7baa12f9e5651e88a239795d90cb401079ca4d4"; + sha512 = "202e9eb99e73e0eb78bb04f3b4ef677533e78f9b0713a7697b8b0e98c3da5401b3dbb240b5165df35ce31e4c809b45ddf99ad986b953a590dfe77a8e103e6da9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4a79bd0bb319c8851828a4a395d7a3f12df8ac812582048758ab007a61ec656785322687dadc46b023caf6fdde6226b25fb31e2c08ced97e73832517196c5b1e"; + sha512 = "bb3a223835f8a5c0248d0b2372361763dce8cd2980ce32d7f9f89c48ad45708ba7687ed7a525778e39fc139a39558269101bdcce6cef6a3476ab7470b38d52a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5c5c465daedb590f848415ac1781909d3645a3634da35ffe76c8e91b9a154f3f848efe23f348e0da4e2e7b79d92b41f98988fb68e59b54103ddcde913a7c8cb0"; + sha512 = "0d804e8567ea16f8935d4c2eb0b9c72d7d701b10b2ade4a08559ed300799d2cc904a40e38b4d4200d4392b646c319cb2421981e1f238b7ec1d44e161239f3e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "338af2c5ff8fc81401cbdd4559b8371bc18a77f07c28c87d71da2d4a164a697aa6f4651e631a507c94adb962059dd6ce772d78d75b2b9224e22e555687422b9a"; + sha512 = "7d764f40f4695ab30fe8fc8d8fa6d90a4db123994d2599ea81a771962832e03976361c06c6013f65f858f323605ea812d3aee1946ba02b6be11148a0f7fd3761"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "95c2dcf9a5f9abd0c2f12e9a40f9f0828a1f05c20b981d0b6c66d85b6e57c689fc443e8ca7504f592baf2e89dceb7e01c0aa9bf34fc06165bb1dcdeeaf5062bd"; + sha512 = "1eedc5f92c9d776306e33f5faf984256a9a7b6f00c88d5e844a1acef9ac340bcf48c8016b1b398e85f40a7c6e211aac3cc31ce00a6f583a0b07a1cd1f3c9a9a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "89c255dd709b9215d2fc933b6d09b0205495455ceceff96dcb9e2ea5b12c98b9fda258aaa12f5aa0a1806067cef1a8434c865c0d7a53c039b1612e0c8d548aa0"; + sha512 = "90107ec2d734c3bead2ac24e0033e2f26ad11dca5f43c59bfe75ca44a33943f76346ac0497659891ca4aaaa10052bb157068a23f2e50fb7680c7f42fd258abaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "39e6043e5caff0925e1f9d475c3a3e1281023336eb79cdfece1a8a5a73d973589258719b517cd6686cfd69400eeedc7b744287286e055e4cbdcb188818c3e94a"; + sha512 = "472877591d3f8ab1d1dbfa6132e8a6e909a62cdf5def3cc196870f0614aa0c02df9fed0138fff0b8eee05e594c887bc02a24880b11bd57c23dea5b0b0983b29b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "570fbffe7e1b70cfc0613e4b230e3dc0bace2225bf52b9b5ddea4812d1a9795aa385ff97e2471209e9a6aa3c5c03fa861741bc8f4dc499a2cd3ffe5cfffa0c0e"; + sha512 = "8abd3ab256491fa5033d5935fc0591dfaa2e9d49e6e988cc5a574533950c2f2f46739346766c2121b89755c073d9bb555832af47f177c43f39fd527ea559a66a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "bb58207314655f500418321d6c04f9849a6263495b0406ad0ae53b43de395dec471ca401dfadd157307d942da3cfd94df8f112cdd4aa37ed249920fc64c8d4a7"; + sha512 = "266267334b93f63a5c70298700f0b7ba65dba2c32694a5dcce0a330d5eb6e8c023c25beb0ed20eb883da71e4488bf5e7ddfedeede9d69c4135f5ad9462a1aa45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "744a0b481604d7f5ce312f0d9cd979e768e5c53c4b251bf3e9e6d97c67450d951bcd5bf4f4e38e830a17a08e6fc98aee30fc862db27013909592ea1e953a57dd"; + sha512 = "f8f23c2d0377b837c4f4ba35bb10ef8c4cd27a298d9a5ab3c9f1d05ec5bfa1aa05a1417a1e887d79e9dc7f51e6efc535784cef78021e8985d8e52f04d32e0493"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "baa1bbbc3c813a168b742a4b20c209c66bdba60b799cc307b99bf08e8975c72deebd5ae6a9aad53d7172305eb2a09cc6292d9f9533f3318de4061a8744e9686e"; + sha512 = "228602ac0dfdd72dbb896390bb825611c81c91e004b82b97bff767b7b2915b44a379392cb4ae7fe3b5b2e1213b4a6ba4dac1877f1fd059358fe8c96d483e3218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "06840fb56bebc72b391907853474b29104107d7b7e2ee719ba48a2197cb166507f95d69ff215f29cfb806350e588c84d5f289460ae8743ba03c7d6c212b91b0d"; + sha512 = "ca99753782f7d750bcc657fbcf36a4d7897a33554e93ad10192a7381b490d420b23dd2c7d0faef8e85e9cf305dbe58e6d1c777ee37a40b998549d348260fe5d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "48e4c56091a1cece6ac3f93e769760b71b8e79cf223ead1f2ed4ac3de89c309cf50bf9a6e86c9b7a22b8d84befee91d65d909c1fa2bba8b04cc7502dd0a57e5a"; + sha512 = "86d35e76f7d67c0a89feef879b470443eb86b7199189066850d71a47785cfe5783a0b65684f811c9750e1f1cca894a3e6fc0abfc9fe3c68849695a8b2329d22c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "8a1af26ab745b2efd03ea44a850cdc8a9f2e4259de8c568db40e54fcf57d902b898eaa7240a5d2621a7f456a8ec717875d1a2e4abe4f8a0c67e9bcd1bd9b4d77"; + sha512 = "5f8449b99cd446a75c2a2615fb9cec10fec2da30b72daf321baa50a177bcac90eef050798f0b1f99cd55967b2e7c350aa63cd9ce807d111816dfed1479296349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "784a233f3098ca62ba0edc67a27af8fceb49f778f500c825cbca54c595d9c5f4a918a16c9bc6d121838981dc006a28bf53d3e3e0531861f261f8ffeb638c0ee5"; + sha512 = "e3b40576f6cf2de97ba0051c8d9f215ce054dd07dcd5b8987543036ad002e01f3da3179fb54708de0999308604877feeae5bfb2298686629ccc7069e024e85cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a585d1c972a039f82fb69268f4a7a6daa9bcab77db9d045720f5a98cd788ee1be0128bb9f112098536975cfc9533d369e6b6b0ccbe5a1e43e93406eff45da5cc"; + sha512 = "d4b92a8e92b4a0a731c22a01ee9b544a66393011cbc424bb9b46b935e80c82bcb3cd402a747a369673e97771a5c005ae0df300d358c531d2cc7cc9a8dda77bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "93d5fd02be91c5e9b0304badbbe360b8755eb5e383168555712ab316ac353c2c8853a9f34ab1a028ede4f31b6b49499c5c31a0e992a0e349b6eafe6fe523285f"; + sha512 = "b683ef089694cd799c47b7d5f2380ca866d7d6f52e58d9eaf6fe317e83bc4b1e7a0399f3031d6cffa138c5f3aa9bf5eb295ec656d2bf6f0cf106acf8fb5f5e77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "d5e197e5727cdec1d83b05a823e4379fa229673adb3d3c2c0125b028cc229747302de8f423bc0972190e01a5658f843c1baf3e1bbc268d541dc07889e8c8ef62"; + sha512 = "91f436012f1acd2745a30be41dd7e8515f4205dcb51d8e02f7b54a9cd54998e1934787b1734abe3bb111c8d5ee6c7f732e3dd7d8090655d37152f5d2704fedd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6b285afe17533f9cff61eb7001b5099128bf475a999a393d21f94f6ef734b123824bd5fd6d3fc77437943145865cfbf3469b23104bcb509707594c1a5a718960"; + sha512 = "f98dc5fd438ffa539bacb7aa277e9e0f1cf6945b9dc93b5e077c59f65ccee21f90eca04cec9e6ea784a9197c2891fac681ecd0b361e110422405b04b9d76bb34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b14bf0b48de19048a6c8188ff064e4012055d3b6ff21eeac10a19c03b6aa85208e7dcc1f2fd28a01b6ffe87eecc968d62082e7fa5ae9b2e5391730fb794e8a97"; + sha512 = "632d543561f33ccc79ce762ee5c93c4371d39867d2941d596d5025c0e307a676edf9ad65b3d1370d5689c7a1d54d36c1c470764d38b948e84137ea1f37ee2910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "771e77e3533c9273ccc08cd88dcda7a07cbf89cd1b5939daceebd24944b3c336c7c203ca1b0d1f7ea2236775099b0edf91d75064b07e4ca76c1bc7eb3b5bb816"; + sha512 = "737b83ead2f9654c7afa632e534254816e7c00bd8b9220097eb63eb7b21472824670efe26e2e3a4a365d3720c0a74f96f16c38b6543c68165ed46ff479a22cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "75da529909fc77d0ad288f63d0e89103d63ce3f815eb8d713b43b712e122255ee4dcc059276dc8c53abb64693de650c8674302987999be5155c19001d8e95ed2"; + sha512 = "f71ca5f154f30252d682b32eaba396fe7419a374737f6ab8c64cf9ab9c65dd8582068cd8ac1abb6aa2b687528b5e95019ebb0e18c60550dea519ab104d3e3c69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a6ebf4ecaddbb57cca585eb0d2883336b98a0c1c7249e2db78a8f2042140d2d01c787444331f5c9d98efc7fc4b5ccf63ff50c4214263ce242b9c37c943a6079b"; + sha512 = "7761d0b4e39a402cd48797bef220450438c4a0bee9987526ed8fb1e68c2dbbc05a3668ef76a7c5f20accc8079e8154f7e3ecdb824d8db6a299b032256f0826f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e6bddf3f932171acd6560bb3a69129f71db73805dcbf01743940d652613ac4cc40875c684cb8ca46b6fd0b2baaf05710e18f1457ec41e9fe4fec08b7dad6193d"; + sha512 = "ca621f2849ac5c83a4de77b037b34f00a60b2dc1155dfad571296b56ff130c6a003a4c28c7749b3476cee04e1635892766abe7577901ebd7b1ca1a9089398634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "863142d61d13085023eed212bc8fd24ef919e22141a560e06deb78b61a822c3af0d9f38c2dfe1574e80f04942682aa1bc0c10361c08e781dcf1ad8b4ef13b108"; + sha512 = "4ea40fa5510ad66bdeda6120dae1af500e79d05ac970f5d67de6c94af5f9250e6f86dda427eb1e43b6fa544e33c33564fd970488836eb4d715f1af717f28302a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "40eb771258cfffb080462e465dc0daa0b6a3bae27ef6b5cf3e8b9e1fdec47ebc7c00f8af392a421971d2e3463456839d3fd0a5fb50d7226e5e27e3346a32b828"; + sha512 = "cd9f467df91afb7fc193b97dfdc845ff958d0db05cf483ab48876316df6f024e49cdcb136e5731ec0171234bfaeac7e4facf50dd949e59996e45a442fa1bcd51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "08426effef46a0b26a35dd0bd37d5021a1968d2a7edfa7617e44bd561502722dc7a98c7fd63be853dc21c29241f0767a7ef31e07d3e8ba1241adc9537edc26d2"; + sha512 = "07cbd77ab9c33057d06340a056ecd34197f9e037527005f046a9b6cfdbd8347f04d6b4ec7b81774f0402ea642be955a2800ae65c7eb8c542a1313136ef44564c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c86de3b4b96d3520e7c4483e86aacaa1c3c56f524ac37dbfa7558a372c12130ff2b55a89bcebf3fc48d361a9e5204c059dd5ce70ca04343ae913b565eb4f193a"; + sha512 = "602fd5c1cd41c9f27eb8a0371b882fe3061125b80173f681640acf07678f00971c4000f8ab4aee3fc62313e4ff5a4ee4ba19fd44043d4fa2cad99f8998033b9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2445e60d7dc548e1da0b79c4518bbf1aa16777ce1e944d8c70599c3c78ab9c4ae24a3c58c7c02734b0d0bf4f4bfe0a777671b82857a95dda69b8d584e6b77a54"; + sha512 = "91891ab6d431f3eaeacd2e33d8efb9069f3671196e613e2ea0bf35838f256e3d9e333b25842090b708e09d531e13e2a234577af6c566af815ed8c5d6e7133c25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c69f7306906fdb8f7757e2e814103467c859aa7da852e3a2e77a8b10d37d327b78ae79fd0e9170593bf82e1975126efb6296a48683e30474bc43fbe026cea046"; + sha512 = "3f1a0fb3a98f6382415b24d9812dfa6a1d716716d1f5bd9094cd9b0fcc794cee2a14d19dc117e7acbab1c9743205a4e2d21964c79aa42649f27c65a08d47df37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b550a887851e2efa5c31da29b83b4152faac726bf64c2fc334ebb72b2fdfc8e74ef6ef2471e431a0efcf2491c22b0c98dd43d1d41373425b0e70216f6a58ada5"; + sha512 = "868d98dc2aca742ad59e0d1510e39f6dfb571f5a5155ba2d515731bb067eb0f41730be49556d93ab957e71d3a1d1694a7da20f30f208b4125be1fc3491becff1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "0b84043d07e62e5a7ba38a769f9949cef05cde65852e90b21e27a09b3d40fbfcbee66c74dbb50e463b3f01e3a07b1c137496feae1856c1c3ba2f4c27ee17b3a5"; + sha512 = "db4e378e90c86828f080283ca009e8ed9d3376ad95955847b4aac5defa0f02552d80e78c368d56582c42c1c067027d9f1e9a817ab633a0dea426b84523844d58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bedfadc5e0c075c284f33a5463b207fd5056117c8de9b5d0b89134be6a5489a43c95e2e741688026b21b09f3e95d3216361bbf767533173d23d5b394025ea82a"; + sha512 = "1e1935d239adabc17e1a0d57c614615aa78154d2fd68a876787f5f3f0ca02ea090ffe1b1803d9528fe8579de988cdd78812b3251f48aa1fff8cc69bb1ed46cbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3a6f79a49f183e920740d306483c697ce4b315b5a25e06c2b74faff74082d632078997f78caacbfdf7b97f598d1510fe1ad4f7a0c57e7eebbf543a263f46f279"; + sha512 = "6ab2ecf874d56fbc6ef6d1a4be74615c39e22da1836f4b20f65132c92789e14d221b589702aeedfe9f0274bbf86350b33b69a6af0dfd53505104e9b95f17c746"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c445fa9f12599a11aa5c13f5c88e5a510ac4ba99e852976504c5030008193e00194603971e1f4078d8e370f74bd3134b3702a5c97be3e6a0e4fb841e24b609e7"; + sha512 = "e7b7479f4be29ba7517da68cd88aa3e9f35031c84b0aa5cbdfdb025682ced06d16f7af5dfc402d5bd4f23230e6f211b98720fb5c7b99a8edcf04b43fac3f4214"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index ed6cf712ed9a92b42ad6f6d12be25ed9375a6ad1..b619941820e626565074097cbf8d1465ffbdbf70 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -67,13 +67,12 @@ let ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + libs = lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -99,7 +98,6 @@ let }; buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins ++ lib.optional (browser ? gtk3) browser.gtk3; buildCommand = '' @@ -119,9 +117,7 @@ let --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${lib.optionalString (!ffmpegSupport) - ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' - + lib.optionalString (browser ? gtk3) + ${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' '' diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 7c007e228f81a1c3099b5eb279b7c9decc751a9a..bb8eb83d6bf0b31a0d7170d337a697c752cdeb66 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.15"; + version = "2.16"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy"; + sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9cad2838a39b20e9e1f71584c6689528dfba99b2..9cdd32d2aaed4d1eef0e1cc1fad60adcce8838f4 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -9,21 +9,24 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { name = "lynx-${version}"; - version = "2.8.9dev.16"; + version = "2.8.9dev.17"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; - sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; + sha256 = "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54"; }; enableParallelBuilding = true; hardeningEnable = [ "pie" ]; - configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; + configureFlags = [ + "--enable-widec" + "--enable-ipv6" + ] ++ stdenv.lib.optional sslSupport "--with-ssl"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A text-mode web browser"; - homepage = http://lynx.invisible-island.net/; + homepage = https://lynx.invisible-island.net/; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 162dd88054c75331c09de918b07714c00a5e946d..6c19b684aaa565d8a3ff6d7f5a14054d60f22feb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p" + "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc" else - "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh" + "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig" else if arch == "x86_64" then - "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7" + "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3" else - "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1"; + "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 42d7aa2f56f06e81307713db1b043fd3b9699ba5..fa9c89b442bb34ba02ed1e271a504b7c482be490 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "29.0.0.140"; + version = "29.0.0.171"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5" + "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67" else - "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl"; + "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 0c0ef501e9963cfefe7e969e57fc0b16a9846ce7..e6b5ee641ee47bf42160f1d979dddf01eb209c52 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.3"; + version = "27.9.2"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; + sha256 = "0v6vgkxac2s1hw1namvrjysj2k1kbkabwdxrpq6kyd8svr7n974r"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f6bc05371f30f8f24980c20acd6924ae42f7a50b --- /dev/null +++ b/pkgs/applications/networking/browsers/qtchan/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, qt, makeWrapper }: + +stdenv.mkDerivation rec { + name = "qtchan-${version}"; + version = "0.100"; + + src = fetchFromGitHub { + owner = "siavash119"; + repo = "qtchan"; + rev = "v${version}"; + sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ qt.qmake makeWrapper ]; + buildInputs = [ qt.qtbase ]; + + qmakeFlags = [ "CONFIG-=app_bundle" ]; + + installPhase = '' + mkdir -p $out/bin + cp qtchan $out/bin + ''; + + preFixup = '' + wrapProgram $out/bin/qtchan \ + --suffix QT_PLUGIN_PATH : ${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix} + ''; + + meta = with stdenv.lib; { + description = "4chan browser in qt5"; + homepage = "https://github.com/siavash119/qtchan"; + license = licenses.mit; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2e31f625f2e78c9ad0202a0651c49695a8f83e37..0cebdd62140cd093f37fed061a17543e16dd56a4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -29,13 +29,13 @@ let in python3Packages.buildPythonApplication rec { name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; - version = "1.2.1"; + version = "1.3.0"; versionPostfix = ""; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw"; + sha256 = "159h669x60pfla71zx28wnrik8rvsrw5i8kbd3xccynk6klm3kw3"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index a2094305db55aa4dc97d8a9fe490d1d043fdbbc1..97b719c1471b42ccc985acdb01e31e33bede63f8 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5.3"; + version = "7.5.4"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d"; + sha256 = "1d5q2vc7kyd2wizl4551yf54rcagh3y2xf1lzvrswxq4kasii3h9"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr"; + sha256 = "18v7ykv23gsylvn9mlkp5547yz3y833i9h126r7195wsqdshizdj"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6bd9614e08de6ed49296d147e4b8ff764dae8dad..8eae85099fb7c30bc789dd308629502750b189f6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "1.14.1077.45-1"; + version = "1.15.1147.42-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d"; + sha256 = "15cajvn2sv05qdp3y538n2xvyy3il49q8zi5928z1mfirjz3dlwh"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9f6b6fcb7e112a28d1671469b16d21e4761181cc..8a006edda6a80ca5ef9651d7d33045f5e74e96f1 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a49ff486d961d85c0a486dd73b409e4f74ed76e8..ae9dc3bbc34ad677b4cbe0779ed67a9ff102e087 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -5,10 +5,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if isLinux - then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1" - else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50"; + then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6" + else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp"; pname = "helm"; - version = "2.8.2"; + version = "2.9.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 56cbef7f00553830ef8f5c02835d90632aa3bc41..fd599cd865868f480ab146e2211fa8ea9e7e0e82 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kontemplate-${version}"; - version = "1.4.0"; + version = "1.5.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj"; + sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index ddb8951740cb8456dd1511189e986a7c34c90390..a1e17f60810d615dabf679f1db7c82da943a1b7d 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: + +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: buildGoPackage rec { name = "kops-${version}"; - version = "1.8.1"; + version = "1.9.0"; goPackagePath = "k8s.io/kops"; @@ -10,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my"; + sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7"; }; buildInputs = [go-bindata]; @@ -24,8 +25,7 @@ buildGoPackage rec { preBuild = '' (cd go/src/k8s.io/kops - go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/... - go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...) + go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) ''; postInstall = '' diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 1a7ba3cf93dfff719abdea935e8e3059551cab6e..e1023afc7aba8e8f41230d68073efc8ce4616cfd 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.9.1"; + version = "1.9.7"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk"; + sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh"; }; # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373 @@ -30,21 +30,6 @@ stdenv.mkDerivation rec { outputs = ["out" "man" "pause"]; - patches = [ - # patch is from https://github.com/kubernetes/kubernetes/pull/58207 - (fetchpatch { - url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch"; - sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w"; - }) - (fetchpatch { - # https://github.com/kubernetes/kubernetes/pull/60978 - # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and - # non-critical failures on prior versions. - url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch"; - sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p"; - }) - ]; - postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 53b24552d373d682db68ac4730a2ff2a83c4fdd2..2ba7bebc0c618aac9ce6fccf6b4a5c7e085b9c78 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -23,7 +23,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.26.0"; + version = "0.27.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6"; + sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 07c9e9ba6784a8efa69091232c383d3d3889ffca..79eb8bb233c977fbe437a9fbb518ff2ba7b88051 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -69,6 +69,8 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" + install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/* + install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/* ''; preFixup = '' diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile b/pkgs/applications/networking/cluster/panamax/api/Gemfile deleted file mode 100644 index 82085aa6db08b66d9ebe1a18c962aab52d896ea0..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile +++ /dev/null @@ -1,23 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sqlite3', '1.3.9' -gem 'faraday_middleware', '0.9.0' -gem 'docker-api', '1.13.0', require: 'docker' -gem 'fleet-api', '0.6.0', require: 'fleet' -gem 'active_model_serializers', '0.9.0' -gem 'octokit', '3.2.0' -gem 'kmts', '2.0.1' - -group :test, :development do - gem 'rspec-rails' - gem 'its' -end - -group :test do - gem 'coveralls', '0.7.0' - gem 'shoulda-matchers', '2.6.1' - gem 'database_cleaner', '1.3.0' - gem 'webmock', '1.20.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock deleted file mode 100644 index 597c691700ad24cd09b1eed2fee5905d2981dd80..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock +++ /dev/null @@ -1,164 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - active_model_serializers (0.9.0) - activemodel (>= 3.2) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - archive-tar-minitar (0.5.2) - arel (5.0.1.20140414130214) - builder (3.2.2) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - database_cleaner (1.3.0) - diff-lcs (1.2.5) - docile (1.1.5) - docker-api (1.13.0) - archive-tar-minitar - excon (>= 0.37.0) - json - erubis (2.7.0) - excon (0.37.0) - faraday (0.8.9) - multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - fleet-api (0.6.0) - faraday (= 0.8.9) - faraday_middleware (= 0.9.0) - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - json (1.8.1) - kmts (2.0.1) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.4.3) - minitest (5.5.1) - multi_json (1.10.1) - multipart-post (1.2.0) - octokit (3.2.0) - sawyer (~> 0.5.3) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sawyer (0.5.4) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - shoulda-matchers (2.6.1) - activesupport (>= 3.0.0) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.9) - term-ansicolor (1.3.0) - tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.0) - tzinfo (1.2.2) - thread_safe (~> 0.1) - webmock (1.20.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - -PLATFORMS - ruby - -DEPENDENCIES - active_model_serializers (= 0.9.0) - coveralls (= 0.7.0) - database_cleaner (= 1.3.0) - docker-api (= 1.13.0) - faraday_middleware (= 0.9.0) - fleet-api (= 0.6.0) - its - kmts (= 2.0.1) - octokit (= 3.2.0) - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - shoulda-matchers (= 2.6.1) - sqlite3 (= 1.3.9) - webmock (= 1.20.0) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix deleted file mode 100644 index 1c2e2ccac27be815f38489b2565a794905d44023..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, libxslt, libxml2, sqlite, openssl, docker -, dataDir ? "/var/lib/panamax-api" }@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.16"; - - env = bundlerEnv { - name = "panamax-api-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - database_yml = builtins.toFile "database.yml" '' - production: - adapter: sqlite3 - database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> - timeout: 5000 - ''; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "0dqg0fbmy5cgjh0ql8yqlybhjyyrslgghjrc24wjhd1rghjn2qi6"; - }; - - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-api $out/share/panamax-api - export sourceRoot="$out/share/panamax-api" - ''; - - postPatch = '' - find . -type f -exec sed -e 's|/usr/bin/docker|${docker}/bin/docker|g' -i "{}" \; - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - export RAILS_ENV=production - - ln -sf ${database_yml} config/database.yml - ''; - - installPhase = '' - rm -rf log tmp - mv ./db ./_db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-api" \ - --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-api" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-api; - description = "The API behind The Panamax UI"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/api/gemset.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix deleted file mode 100644 index 8182543a2bb9bcba4d1bab442cc9c51b2987ecbd..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/gemset.nix +++ /dev/null @@ -1,568 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "active_model_serializers" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1ws3gx3wwlm17w7k0agwzmcmww6627lvqaqm828lzm3g1xqilkkl"; - }; - dependencies = [ - "activemodel" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "archive-tar-minitar" = { - version = "0.5.2"; - source = { - type = "gem"; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "database_cleaner" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "docker-api" = { - version = "1.13.0"; - source = { - type = "gem"; - sha256 = "1rara27gn7lxaf12dqkx8s1clssg10jndfcy4wz2fv6ms1i1lnp6"; - }; - dependencies = [ - "archive-tar-minitar" - "excon" - "json" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "excon" = { - version = "0.37.0"; - source = { - type = "gem"; - sha256 = "05x7asmsq5m419n1lhzk9bic02gwng4cqmrcqsfnd6kmkwm8csv2"; - }; - }; - "faraday" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "faraday_middleware" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2"; - }; - dependencies = [ - "faraday" - ]; - }; - "fleet-api" = { - version = "0.6.0"; - source = { - type = "gem"; - sha256 = "0136mzc0fxp6mzh38n6xbg87cw9g9vq1nrlr3ylazbflvmlxgan6"; - }; - dependencies = [ - "faraday" - "faraday_middleware" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "json" = { - version = "1.8.1"; - source = { - type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; - }; - }; - "kmts" = { - version = "2.0.1"; - source = { - type = "gem"; - sha256 = "1wk680q443lg35a25am6i8xawf16iqg5xnq1m8xd2gib4dsy1d8v"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "multipart-post" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; - }; - }; - "octokit" = { - version = "3.2.0"; - source = { - type = "gem"; - sha256 = "07ll3x1hv72zssb4hkdw56xg3xk6x4fch4yf38zljvbh388r11ng"; - }; - dependencies = [ - "sawyer" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "rest-client" = { - version = "1.6.7"; - source = { - type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; - }; - dependencies = [ - "mime-types" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sawyer" = { - version = "0.5.4"; - source = { - type = "gem"; - sha256 = "01kl4zpf0gaacnkra5nikrzfpwj8f10hsvgyzm7z2s1mz4iipx2v"; - }; - dependencies = [ - "addressable" - "faraday" - ]; - }; - "shoulda-matchers" = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1p3jhvd4dsj6d7nbmvnqhqhpmb8pnr05pi7jv9ajwqcys8140mc1"; - }; - dependencies = [ - "activesupport" - ]; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "sqlite3" = { - version = "1.3.9"; - source = { - type = "gem"; - sha256 = "07m6a6flmyyi0rkg0j7x1a9861zngwjnximfh95cli2zzd57914r"; - }; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1yxa5kyp9mw4w866wlg7c32ingzqxnzh3ir9yf06pwpkmq3mrbdi"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "webmock" = { - version = "1.20.0"; - source = { - type = "gem"; - sha256 = "0bl5v0xzcj24lx7xpsnywv3liqnqb5lfxysmmfb2fgi0n8586i6m"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; -} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile b/pkgs/applications/networking/cluster/panamax/ui/Gemfile deleted file mode 100644 index 6f7dc59d04d03586a1d8890ed08ebc664a5ba344..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile +++ /dev/null @@ -1,31 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sass', '3.3.9' -gem 'therubyracer', '0.12.1', platforms: :ruby -gem 'haml', '4.0.5' -gem 'uglifier', '2.5.1' -gem 'ctl_base_ui' -gem 'activeresource', '4.0.0' -gem 'kramdown', '1.4.0' -gem 'zeroclipboard-rails' - - -group :test, :development do - gem 'rspec-rails' - gem 'its' - gem 'capybara' - gem 'teaspoon' - gem 'phantomjs' - gem 'dotenv-rails', '0.11.1' - gem 'pry' - gem 'pry-byebug' - gem 'pry-stack_explorer' -end - -group :test do - gem 'webmock' - gem 'sinatra', '1.4.5' - gem 'coveralls', '0.7.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock deleted file mode 100644 index b273595bbb051f2fe48dd74d18afd20dc532e841..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock +++ /dev/null @@ -1,226 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - arel (5.0.1.20140414130214) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - builder (3.2.2) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - slop (~> 3.6) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - coderay (1.1.0) - columnize (0.8.9) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.5) - haml (~> 4.0) - jquery-rails (~> 3.1) - jquery-ui-rails (~> 4.2) - rails (~> 4.1) - sass (~> 3.3) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) - diff-lcs (1.2.5) - docile (1.1.5) - dotenv (0.11.1) - dotenv-deployment (~> 0.0.2) - dotenv-deployment (0.0.2) - dotenv-rails (0.11.1) - dotenv (= 0.11.1) - erubis (2.7.0) - execjs (2.2.2) - haml (4.0.5) - tilt - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) - railties (>= 3.2.16) - json (1.8.2) - kramdown (1.4.0) - libv8 (3.16.14.11) - mail (2.6.3) - mime-types (>= 1.16, < 3) - method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.5.1) - multi_json (1.10.1) - netrc (0.8.0) - nokogiri (1.6.5) - mini_portile (~> 0.6.0) - phantomjs (1.9.7.1) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (2.0.0) - byebug (~> 3.4) - pry (~> 0.10) - pry-stack_explorer (0.4.9.1) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - ref (1.0.5) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sass (3.3.9) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.5) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.6.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - teaspoon (0.8.0) - railties (>= 3.2.5, < 5) - term-ansicolor (1.3.0) - tins (~> 1.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.3) - tzinfo (1.2.2) - thread_safe (~> 0.1) - uglifier (2.5.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - webmock (1.20.4) - addressable (>= 2.3.6) - crack (>= 0.3.2) - xpath (2.0.0) - nokogiri (~> 1.3) - zeroclipboard-rails (0.1.0) - railties (>= 3.1) - -PLATFORMS - ruby - -DEPENDENCIES - activeresource (= 4.0.0) - capybara - coveralls (= 0.7.0) - ctl_base_ui - dotenv-rails (= 0.11.1) - haml (= 4.0.5) - its - kramdown (= 1.4.0) - phantomjs - pry - pry-byebug - pry-stack_explorer - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - sass (= 3.3.9) - sinatra (= 1.4.5) - teaspoon - therubyracer (= 0.12.1) - uglifier (= 2.5.1) - webmock - zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix deleted file mode 100644 index 2f60942f014babdda2440c494609a2e0555dffbe..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-ui-${version}"; - version = "0.2.14"; - - env = bundlerEnv { - name = "panamax-ui-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "01k0h0rjqp5arvwxm2xpfxjsag5qw0qqlg7hx4v8f6jsyc4wmjfl"; - }; - - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-ui $out/share/panamax-ui - export sourceRoot="$out/share/panamax-ui" - ''; - - postPatch = '' - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Journal|NixOS Journal|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \; - sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb" - # fix libv8 dependency - substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11" - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - ''; - - buildPhase = '' - rm -f ./bin/* - bundle exec rake rails:update:bin - ''; - - installPhase = '' - rm -rf log tmp db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-ui" \ - --prefix "PATH" : "$out/share/panamax-ui/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-ui" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-ui:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-ui; - description = "The Web GUI for Panamax"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix deleted file mode 100644 index b41b482edb73c12331222bae51f1914ee4f97c8a..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix +++ /dev/null @@ -1,789 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activeresource" = { - version = "4.0.0"; - source = { - type = "gem"; - sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq"; - }; - dependencies = [ - "activemodel" - "activesupport" - "rails-observers" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "binding_of_caller" = { - version = "0.7.2"; - source = { - type = "gem"; - sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; - }; - dependencies = [ - "debug_inspector" - ]; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "byebug" = { - version = "3.5.1"; - source = { - type = "gem"; - sha256 = "0ldc2r0b316rrn2fgdgiznskj9gb0q9n60243laq7nqw9na8wdan"; - }; - dependencies = [ - "columnize" - "debugger-linecache" - "slop" - ]; - }; - "capybara" = { - version = "2.4.4"; - source = { - type = "gem"; - sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; - }; - dependencies = [ - "mime-types" - "nokogiri" - "rack" - "rack-test" - "xpath" - ]; - }; - "coderay" = { - version = "1.1.0"; - source = { - type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; - }; - }; - "columnize" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "1f3azq8pvdaaclljanwhab78hdw40k908ma2cwk59qzj4hvf7mip"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "ctl_base_ui" = { - version = "0.0.5"; - source = { - type = "gem"; - sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; - }; - dependencies = [ - "haml" - "jquery-rails" - "jquery-ui-rails" - "rails" - "sass" - ]; - }; - "debug_inspector" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m"; - }; - }; - "debugger-linecache" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "0iwyx190fd5vfwj1gzr8pg3m374kqqix4g4fc4qw29sp54d3fpdz"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "dotenv" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m"; - }; - dependencies = [ - "dotenv-deployment" - ]; - }; - "dotenv-deployment" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c"; - }; - }; - "dotenv-rails" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "0r6hif0i1lipbi7mkxx7wa5clsn65n6wyd9jry262cx396lsfrqy"; - }; - dependencies = [ - "dotenv" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "execjs" = { - version = "2.2.2"; - source = { - type = "gem"; - sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; - }; - }; - "haml" = { - version = "4.0.5"; - source = { - type = "gem"; - sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85"; - }; - dependencies = [ - "tilt" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "jquery-rails" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0h5a565i3l2mbd221m6mz9d1nr53pz19i9qxv08qr1dv0yx2pr3y"; - }; - dependencies = [ - "railties" - "thor" - ]; - }; - "jquery-ui-rails" = { - version = "4.2.1"; - source = { - type = "gem"; - sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v"; - }; - dependencies = [ - "railties" - ]; - }; - "json" = { - version = "1.8.2"; - source = { - type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; - }; - }; - "kramdown" = { - version = "1.4.0"; - source = { - type = "gem"; - sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80"; - }; - }; - libv8 = { - version = "3.16.14.11"; - source = { - type = "gem"; - sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "method_source" = { - version = "0.8.2"; - source = { - type = "gem"; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; - }; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "mini_portile" = { - version = "0.6.1"; - source = { - type = "gem"; - sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "netrc" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; - }; - }; - "nokogiri" = { - version = "1.6.5"; - source = { - type = "gem"; - sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; - }; - dependencies = [ - "mini_portile" - ]; - }; - "phantomjs" = { - version = "1.9.7.1"; - source = { - type = "gem"; - sha256 = "14as0yzwbzvshbp1f8igjxcdxc5vbjgh0jhdvy393il084inlrl7"; - }; - }; - "pry" = { - version = "0.10.1"; - source = { - type = "gem"; - sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; - }; - dependencies = [ - "coderay" - "method_source" - "slop" - ]; - }; - "pry-byebug" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "17b6720ci9345wkzj369ydyj6hdlg2krd26zivpd4dvaijszzgzq"; - }; - dependencies = [ - "byebug" - "pry" - ]; - }; - "pry-stack_explorer" = { - version = "0.4.9.1"; - source = { - type = "gem"; - sha256 = "1828jqcfdr9nk86n15ky199vf33cfz51wkpv6kx230g0dsh9r85z"; - }; - dependencies = [ - "binding_of_caller" - "pry" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-protection" = { - version = "1.5.3"; - source = { - type = "gem"; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; - }; - dependencies = [ - "rack" - ]; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "rails-observers" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy"; - }; - dependencies = [ - "activemodel" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "ref" = { - version = "1.0.5"; - source = { - type = "gem"; - sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la"; - }; - }; - "rest-client" = { - version = "1.7.2"; - source = { - type = "gem"; - sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; - }; - dependencies = [ - "mime-types" - "netrc" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sass" = { - version = "3.3.9"; - source = { - type = "gem"; - sha256 = "0k19vj73283i907z4wfkc9qdska2b19z7ps6lcr5s4qzwis1zkmz"; - }; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sinatra" = { - version = "1.4.5"; - source = { - type = "gem"; - sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s"; - }; - dependencies = [ - "rack" - "rack-protection" - "tilt" - ]; - }; - "slop" = { - version = "3.6.0"; - source = { - type = "gem"; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "teaspoon" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j3brbm9cv5km9d9wzb6q2b3cvc6m254z48h7h77z1w6c5wr0p3z"; - }; - dependencies = [ - "railties" - ]; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "therubyracer" = { - version = "0.12.1"; - source = { - type = "gem"; - sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6"; - }; - dependencies = [ - "libv8" - "ref" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.3"; - source = { - type = "gem"; - sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "uglifier" = { - version = "2.5.1"; - source = { - type = "gem"; - sha256 = "1vihq309mzv9a2i0s8v4imrn1g2kj8z0vr88q3i5b657c4kxzfp0"; - }; - dependencies = [ - "execjs" - "json" - ]; - }; - "webmock" = { - version = "1.20.4"; - source = { - type = "gem"; - sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; - "xpath" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; - }; - dependencies = [ - "nokogiri" - ]; - }; - "zeroclipboard-rails" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "00ixal0a0mxaqsyzp06c6zz4qdwqydy1qv4n7hbyqfhbmsdalcfc"; - }; - dependencies = [ - "railties" - ]; - }; -} diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9a0bb0104d4cde27a9e05b7b24b1a967863a7ab9 --- /dev/null +++ b/pkgs/applications/networking/flent/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }: + +buildPythonApplication rec { + pname = "flent"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "tohojo"; + repo = "flent"; + rev = version; + sha256 = "0rl4ahynl6ymw7r04vpg9p90pplrxc41rjlzvm0swxsvpw40yvkm"; + }; + + buildInputs = [ netperf ]; + propagatedBuildInputs = [ + matplotlib + procps + pyqt5 + ]; + + meta = with stdenv.lib; { + description = "The FLExible Network Tester"; + homepage = https://flent.org; + license = licenses.gpl3; + + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 538e9a3786be15689bf4cbe327538e2a03f00fb5..eff33643ebcfa4b17c6663b578c0688b62d200a6 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig -, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad -, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { @@ -11,11 +10,10 @@ stdenv.mkDerivation rec { sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [zlib openssl libre librem - cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good + buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx - ]; + ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { "CCACHE_DISABLE=1" "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 95e01e586ec2ada87e9715fc9e2ec8d7c1e0972b..75df17bd5b0149fea2b0ef48fc50478119ea8626 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: @@ -8,17 +8,6 @@ let version = "4.0.4"; - runtimeDeps = [ - udev libnotify - ]; - deps = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver - ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - ] ++ runtimeDeps; - desktopItem = makeDesktopItem rec { name = "Franz"; exec = name; @@ -39,16 +28,21 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver + ]) ++ [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc + ]; + runtimeDependencies = [ udev.lib libnotify ]; unpackPhase = '' tar xzf $src ''; installPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz - patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz - mkdir -p $out/bin $out/opt/franz cp -r * $out/opt/franz ln -s $out/opt/franz/Franz $out/bin diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5246f8d3d1d679f3f9d79569ae433a468b144906 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGo110Package, fetchFromGitHub }: + +buildGo110Package rec { + name = "gomuks-${version}"; + version = "2018-05-16"; + + goPackagePath = "maunium.net/go/gomuks"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "gomuks"; + rev = "512ca88804268bf58a754e8a02be556f953db317"; + sha256 = "1bpgjkpvqqks3ljw9s0hm5pgscjs4rjy8rfpl2444m4rbpz1xvmr"; + }; + + meta = with stdenv.lib; { + homepage = https://maunium.net/go/gomuks/; + description = "A terminal based Matrix client written in Go"; + license = licenses.gpl3; + maintainers = with maintainers; [ tilpner ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 8405769582f7ef759b3a3a983bf1859fb3b2d2ab..688ac6d10d6fc61f763b25f4df48b9ea3a8806ef 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -17,8 +17,8 @@ let src = fetchFromGitHub { owner = "mujx"; repo = "matrix-structs"; - rev = "91bb2b85a75d664007ef81aeb500d35268425922"; - sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx"; + rev = "690080daa3bc1984297c4d7103cde9ea07e2e0b7"; + sha256 = "0l6mncpdbjmrzp5a3q1jv0sxf7bwl5ljslrcjca1j2bjjbqb61bz"; }; postUnpack = '' @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn"; + sha256 = "1yg6bk193mqj99x3sy0f20x3ggpl0ahrp36w6hhx7pyw5qm17342"; }; # This patch is likely not strictly speaking needed, but will help detect when diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch index 661ae756a4dde6dd73cf2eb0749301a469a87e6c..a3425a78045435ba3382012eb12c454ca063678b 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch +++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch @@ -54,7 +54,7 @@ index cef00f6..e69de29 100644 - MatrixStructs - - GIT_REPOSITORY https://github.com/mujx/matrix-structs -- GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922 +- GIT_TAG 690080daa3bc1984297c4d7103cde9ea07e2e0b7 - - BUILD_IN_SOURCE 1 - SOURCE_DIR ${MATRIX_STRUCTS_ROOT} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix index 37b490304c4f2993b716ef23dfd2c81b6e86cc16..8eb086a98070fcc876f3a221b54a01e378a8b419 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -5,18 +5,18 @@ let pidginHg = fetchhg { url = "https://bitbucket.org/pidgin/main"; # take from VERSION file - rev = "c9b74a765767"; - sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3"; + rev = "9ff9acf9fa14"; + sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv"; }; in stdenv.mkDerivation rec { - name = "purple-facebook-0.9.3"; + name = "purple-facebook-0.9.5"; src = fetchFromGitHub { owner = "dequis"; repo = "purple-facebook"; - rev = "v0.9.3-c9b74a765767"; - sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb"; + rev = "v0.9.5-9ff9acf9fa14"; + sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bcfcbee8556847685a9663895a8bc4029137cce6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: + +stdenv.mkDerivation rec { + name = "purple-lurch-${version}"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "gkdr"; + repo = "lurch"; + rev = "v${version}"; + sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ]; + + dontUseCmakeConfigure = true; + + installPhase = '' + install -Dm755 -t $out/lib/purple-2 build/lurch.so + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gkdr/lurch; + description = "XEP-0384: OMEMO Encryption for libpurple"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 3ec45702b1754275e859241fa319b6f740e00dda..430357cc666aec166e6911609dd990ecc7e71cb1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -15,11 +15,11 @@ let unwrapped = stdenv.mkDerivation rec { name = "pidgin-${version}"; majorVersion = "2"; - version = "${majorVersion}.12.0"; + version = "${majorVersion}.13.0"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc"; + sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; }; inherit nss ncurses; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ce558130a6ce8aba6bc4e23d8f4c6ea17967d628..512c31e3d04137a104a9c8bb823facb9768bd7ac 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.1"; + version = "0.15.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; + sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 479b89bcecbd160f141de80d95d7b6ec59baa4ad..ca13a8811763c4c666b8ff72e6cc42b77d9da3c6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.9.0"; + version = "1.11.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "18i9chyarpcw369rqyldckkln1lxy5g9qy9f5gy5gsz9y5qngxqa"; + sha256 = "0s3qlzm7iy9qxca2hlh1hq0dnjr7y5wxad1ssqgmyhxsif0nqm96"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e3b3d71918924c2c2c9b464ff167e052fd58b7ed --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, qttools, scons +, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 +, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib +}: + +let + _scons = "scons -j$NIX_BUILD_CORES"; +in stdenv.mkDerivation rec { + name = "swift-im-${version}"; + version = "4.0.2"; + + src = fetchurl { + url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; + }; + + patches = [ ./scons.patch ]; + + nativeBuildInputs = [ pkgconfig qttools scons ]; + + buildInputs = [ + GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 + lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib + ]; + + propagatedUserEnvPkgs = [ GConf ]; + + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + "-I${miniupnpc}/include/miniupnpc" + ]; + + buildPhase = '' + ${_scons} Swift + ''; + + installPhase = '' + ${_scons} SWIFT_INSTALLDIR=$out $out + ''; + + meta = with stdenv.lib; { + homepage = https://swift.im/; + description = "Qt XMPP client"; + license = licenses.gpl3; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch new file mode 100644 index 0000000000000000000000000000000000000000..c63b05d7acb1a0e03b40c43fb5188fbbd88f0fec --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch @@ -0,0 +1,53 @@ +diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot +index 40f242513..53e1ff26a 100644 +--- a/BuildTools/SCons/SConscript.boot ++++ b/BuildTools/SCons/SConscript.boot +@@ -508,6 +508,7 @@ if env.get("distcc", False) : + if var.startswith("DISTCC_") : + env["ENV"][var] = os.environ[var] + ++env["ENV"] = os.environ + conf_env = env.Clone() + + Export("env") +diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct +index 70bffbcfe..fef281899 100644 +--- a/BuildTools/SCons/SConstruct ++++ b/BuildTools/SCons/SConstruct +@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] + gconf_env = conf_env.Clone() + conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG}) + if conf.CheckPKG("gconf-2.0") : +- gconf_bare_env = Environment() ++ gconf_bare_env = Environment(ENV = os.environ) + gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') + if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : + gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] +@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags) + env["HAVE_HUNSPELL"] = 0; + if env.get("hunspell_enable", False) : + hunspell_conf = Configure(hunspell_env) +- if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") : ++ if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") : + env["HAVE_HUNSPELL"] = 1 +- hunspell_flags["LIBS"] = ["hunspell"] ++ hunspell_flags["LIBS"] = ["hunspell-1.6"] + env["HUNSPELL_FLAGS"] = hunspell_flags + hunspell_conf.Finish() + +diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py +index 89f8963dc..b8559f7a6 100644 +--- a/BuildTools/SCons/Tools/textfile.py ++++ b/BuildTools/SCons/Tools/textfile.py +@@ -113,7 +113,10 @@ def _action(target, source, env): + lsep = None + for s in source: + if lsep: fd.write(lsep) +- fd.write(_do_subst(s, subs)) ++ b = _do_subst(s, subs) ++ if isinstance(b, unicode): ++ b = b.encode('UTF-8') ++ fd.write(b) + lsep = linesep + fd.close() + diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c47ce04f1f7dfbcb8ec9f3f9172ac6ef7bf0f88f..2799f50e584c0189b0453341f0106d682087dfb9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,5 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; + version = "1.2.21"; + sha256Hash = "0s7dywyz8p626741m32l4a90l1x01564xg2g10gvdb25s2phdfdl"; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 2588340de1deb8ca0e812e0a0395a5a43baaba7b..7581482504b74747a4a7fe1abb57fccf5d2a87ea 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -114,7 +114,7 @@ mkDerivation rec { install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop" sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol for icon_size in 16 32 48 64 128 256 512; do - install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" + install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png" done ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index f1b3c55d14c3a101c44c806374148a55a1830269..1791a7ff1ddc4874be948ba4af6b3bafd79d6353 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; - sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; + sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 03b4b980929c807b80444960c28349d977239e5c..692a43629355f7a8083c0406a8b681eabf501c61 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, - alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio, + utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps, libGL }: let - version = "2.0.106600.0904"; + version = "2.0.123200.0405"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s"; + sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z"; }; }; @@ -17,25 +17,21 @@ in stdenv.mkDerivation { src = srcs.${system}; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ alsaLib - dbus + expat glib - gstreamer - fontconfig freetype + libGL libpulseaudio - libxml2 - libxslt - nspr - nss + zlib + dbus + fontconfig sqlite utillinux - zlib udev - expat xorg.libX11 xorg.libSM @@ -79,6 +75,7 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ + --prefix PATH : "${procps}/bin" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 25e5a61f27224fa594e3708a88ddb262f4ecc3cf..917de745d2776584fb4dded52e84a420782133a6 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { " ''; - postInstall = '' + postInstall = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" ''; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 610b16dab5bc5ba21b78d068799c321c5d58c0d5..9a348fc03f7ad13a5a3642905f13ab9e3d15418f 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 -, libsass, notmuch, boost, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 +, libsass, notmuch, boost, wrapGAppsHook, glib-networking }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c"; + sha256 = "1z48rvlzwi7bq7j55rnb0gg1a4k486yj910z2cxz1p46lxk332j1"; }; - nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings-desktop-schemas ]; - - buildPhase = "scons --propagate-environment --prefix=$out build"; - installPhase = "scons --propagate-environment --prefix=$out install"; + notmuch boost gnome3.gsettings-desktop-schemas + glib-networking ]; meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index bbd56b188dfd1acd35ddc938be0160051bc24684..81cf4541222f8dcf25c1d76883b17c543c8e9136 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz"; + sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 7bd0ea70dc63387af07c2b0a628925aa9f2cdedb..2ae58721188e3314c7719aa8162df5d1f9be94d9 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180323"; + version = "20180512"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w"; + sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180323 so we disable them for now. + # that has tests (20180223) as well as 20180512 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 24b16744ff65dc8bb4040dd58c5e119abf1bf5cf..56b9e5cfb04b8b425ea43b8f05806b363a8cc677 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.7.0"; + version = "52.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ar/thunderbird-52.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5"; + sha512 = "7ba3e6d4a64ce91b16d79607c3530deba2d68b09c81f7509991c62a11736ee51278b3cd60ca8063ce94748bf0b483cd9d9ea3be4ba84b24bef56194053502550"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ast/thunderbird-52.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a"; + sha512 = "192442636ec56f7751d752572122c8b435fb28d6801a398dc6d02896d1f99d51feebbdb906f3911da08bb9da2851d3ea29eb064949d53436a6764292a6aeee7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/be/thunderbird-52.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee"; + sha512 = "facdfa7f6ec8eacc6a9294958c879a32cd5dadd31364d64894f8ad1a38ff883a9f2471d49d1358fa79b2b585a33ba7d710b195ec6101760289b8429d073004a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bg/thunderbird-52.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe"; + sha512 = "5dae827d4111bf6f07f1f794ab71cfabd4763d9f344b9666143a0c559c93479da532056d43f25b8d130284b9affeddd4d08c8e7042c86b681a1566a7b8822c87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bn-BD/thunderbird-52.8.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5"; + sha512 = "fc5816d829c836b8c0995405c9e33ead778ffdff7d1ec11c57113b87954ca1be6e58281244fe5985f7eb84572e56202a700d7bf382c0abe0e4f11598929cccea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/br/thunderbird-52.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a"; + sha512 = "4b2ad9013cfe07708ec6cbab5fa79556d20d0146e5d853951c11c2d7629d795a7a9a16a6d7faf3c2dac535f5d368d98d98ca631c367c8b9cc6e3cd13763f6146"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ca/thunderbird-52.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c"; + sha512 = "2ef0f547dfea3d1ab97fba96673ff10d6bc0bdb24ea20c457b4baaf6cb987166219eb8d7c4e9c7a8f89b5933f65654f3cf8da8be7145c1378f1d5f51b8751825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cs/thunderbird-52.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119"; + sha512 = "57f55ea5c102274b42154433a9df9663f8594d62a5b25aa18fcdaedeeb52d6556cdbce8542f2f301f5c7ea08354d90ed769c9e6b95664d6aecdd3f58e7e7aaeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cy/thunderbird-52.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04"; + sha512 = "241729c3a385ca1fba281b5985513486a3fc9b768a41c4d8d1c0249bd9d3b4de032a76c6b2df383041840ec2913eadc854f2f8b85bc7de782a4f09001f0f5ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/da/thunderbird-52.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a"; + sha512 = "4368a9301d40becf9675379c217040023faac8862482c5521a47f06e6c2a7466ec0b251475db111ed7f37c72cab0742e20b58463d2519a1fd6f77bc8e360330a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/de/thunderbird-52.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15"; + sha512 = "08c2fa848f3dc5fdccc498c935a03ac4e12d3bc3707beaafa5b9bff1c2aa51d6eb2a6e8373a0185f123a1ba77bb720e40ec9f8b364ef5b7a2f7810260ca9c372"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/dsb/thunderbird-52.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673"; + sha512 = "83ccb82aad5d63952674707c2c2317b4296f4b8ac56cd3ff9e294023036c1354f8f373d3b977f5f1cc5f9a9fb4876cb68b8dca786d5e2a07e28443e85e531e63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/el/thunderbird-52.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a"; + sha512 = "4e6f9982e661d6935bbf6b4490a0f66ab2c082ecaf3e6bfc67e32a878b3cb60c7e98d2b5ae07439e43aa4f0f5f7b64616dd22fe1e3db9a5e28e42285a2c1ac6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-GB/thunderbird-52.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e"; + sha512 = "3ffb11f6ad966980eefa882933b2ac791d73eb338907b8c3915905420318f0e52e16037fb6e04c2add9641e4d89424a48d769cc472234c4b25ddcaa51913d1c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-US/thunderbird-52.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334"; + sha512 = "d5c2ab406d1820745bf425ba7bf6b947166747d0037f1519c0e4a76a6036be9eed1e00e563c7f663f7472ef77a6a85b646f9ed706f26666dc1d4dd39dba3f917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-AR/thunderbird-52.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf"; + sha512 = "c5971b74a717f24047cf43c4a20ee5c3d0c952a1f3c28ca2692887426746afaa1e8fdf4abbb601193cdf594912013b20ecabdcf8dcd301db221a8a632056e0ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-ES/thunderbird-52.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead"; + sha512 = "7b58ae76bd7026088c5d3a6e00b64e8445c29a898aaba8363524d436dba650ae1438feabe28e599e116ea7d995c864ff84688a09606476109bdd6aad48304973"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/et/thunderbird-52.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d"; + sha512 = "a71f40dadab629369f8ece09613c8d7ad78314da38489705a880b436afb7649523f50c189501279c1c0269953c7561b81d1de29ff9c1fe1bd22fab734772e8bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/eu/thunderbird-52.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801"; + sha512 = "2e9e6f58505c4873e5f3f263b75ea56bf50fd82320b78b2bb5ea0876773fe87ce5b76cd4e48c0781565690a28e86cc611ff17e7223db4134e2978e0729e2630a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fi/thunderbird-52.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61"; + sha512 = "5b22836043bddda0abefd5a9613f17ee147988de819d221f184482161d1667c4a9555763376e5d0e28b3f0fe0ec4482994368ca26745ccabd1826db0bd847af9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fr/thunderbird-52.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec"; + sha512 = "c465c33cf95bced2fddd7d4e3c624c3f98ffe02c2aeb21ab8946c1b1c37a31211bf79fb80a5fe767872dbe9cb1cfeabcbebea7bfc8e8dee1404b8c75c9aa6a4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fy-NL/thunderbird-52.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975"; + sha512 = "51d262f87d2766e1c44370ba8f9d22df7e2b0876059bcfdef4b9b7809056468fab1cc6ee7abb892ce293d392548ebbaeccc55bf58c251aa774a8d936a7a50ef3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ga-IE/thunderbird-52.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d"; + sha512 = "f9354bb331f6ef82cccde57eaaaf73887d904b76ed2157ab4ffcf37109928160127714cf51586032049a78e7215c43211719f2be1c860828585a344742c1ec91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gd/thunderbird-52.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d"; + sha512 = "926060b60e5fef2020c27e64a93c246ea9f477d82d8138c1a1e6439098e8e1809aa74747d45ee9b069dd32ac07624b24b022d318efaa3c1b5b02e8c8d599a54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gl/thunderbird-52.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c"; + sha512 = "d07e61440f1e938b0af4b5db38187a7cf7c6ca8584eec093c292b5f6b7096b529fc20db06766b11001f8d13e1c7dae7a5d3c798e82f3eac9dadcf8a8a50107bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/he/thunderbird-52.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e"; + sha512 = "7661135b35207b781bdc9a402128eaaace6f67c8558e6cdff271d946c88cf023de8307ca1a7c0ece4e0424e37d38b2b5e2f24fa966f7e13078dd56dc6a1972d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hr/thunderbird-52.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe"; + sha512 = "d5db8e96bdf2061d8f24b9b332b9ca4e7fe64316385e32f01023520f80605bba50b2de8263d7aa67fbd5b3a9b39fd20a050bef4742804da4ae03b4d866ed8012"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hsb/thunderbird-52.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c"; + sha512 = "9cff35b2b5a4dab919e38180cfa88d7c3c249c9e119f6de850bd6e72018e6a62b1078ddafaef6c73c210b8c1dea3caa7987d88c75513f76033186bb7926f5e81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hu/thunderbird-52.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31"; + sha512 = "56057845898226d58981107d1ab14c3ca02547c0767e768f45c48f30097e14a7745c43b3b2b0bbdae81bc6ecdcd323194d30006ad20ab2b0de2cb3b29c15dba0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hy-AM/thunderbird-52.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248"; + sha512 = "6595e53a1b790cc2ee47f071d395dce94b44aafee80d2efc1613ee44d3698736db972f45806848dd9b35de699dec53b8b5e64e596b0b49b1e829326e57880904"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/id/thunderbird-52.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6"; + sha512 = "878b475a2073c97e6af40bac24c2cfb88a73c8bdcba58b5d8cb2958f5114093fabaa6309f32096347c4ebb4baa828bbdf0077995284f1d2ae32eb234a7ca1d78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/is/thunderbird-52.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787"; + sha512 = "a8ed951689420281cbfd660bf23a4e5e3764da4894b31eb723b18c2923ca7f5f1b13d6a279f93d3cdf524f0a9387bb706c3d187ee4b84c74490fdba7867ffe25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/it/thunderbird-52.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea"; + sha512 = "24942a2fb5dc9a41641232f728077c8bfe5e99c5766ef4327a11e7e60858520a267ef12e0bebed7d9ff2664ba45d672fa1aa24c9ebdba9048bba10f6e73f6d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ja/thunderbird-52.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41"; + sha512 = "291e715308f4bfb605fe987ce774d3f5cac211f920f62ea5e8abf12b51458f2da19c36329eca8fbbf185ec2eac9793dccc3d7483b320c0341ecc17bb477af263"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/kab/thunderbird-52.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6"; + sha512 = "de78483cd0b0a35687e091c52bd57d9de400a97ddeafd3b7708565501ff20da7ca1025940198aba6d410646d72be39bfca780d36df6b323ceef63cb085b214ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ko/thunderbird-52.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c"; + sha512 = "b87fcc1baee680496b5bc13b1c87a3440c50f46be6e22b175cc8aff51bfc18bdeaad662d3cc10ebb255cfdf6d35ff2e59e9082f9d36dc5ddb079c49cda4d9d70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/lt/thunderbird-52.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410"; + sha512 = "093519e8b927f2d716f76925fe40dc0b63835e51c446bf6759992419396f922a38f24d6f8e3fa2c0c252f391a2ff812084d26d36d414d77ba5d961a091b12756"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nb-NO/thunderbird-52.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c"; + sha512 = "970a4d41c779e224504524ab8aa2b3bf83c71facc5f666c887b2eff27a8ee39e15404c0812376280dffa0c0642216e6e966004b577572ddb8d9e7cfae0544059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nl/thunderbird-52.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597"; + sha512 = "7248b9d9a51f5f0b5b628b744e935c1d9c21a0a41cb5d77ab66b2e470bf6788774f1b769435f4526afb8d7c28d8fb240a3b3a918b6f20db617b599285e11b5fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nn-NO/thunderbird-52.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694"; + sha512 = "6f8e73df3122bc6985f7c37b5eed90c64914e83a800caabeb27a5b155085b5def8685c6af237e8f0cd605db28681a5df0cf4cfed32fa97b6d594666041bbca16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pa-IN/thunderbird-52.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9"; + sha512 = "56f1e10c22acb54a5e6dea22be888525f24e9afc7ec2dfbe8cefee45196737bc68f0a39e7b25e0ab1376b3d7301f753958a11e66f60392f340a3f3f5896c9d5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pl/thunderbird-52.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c"; + sha512 = "3dc5ae6f3e6451fa942fada6e2b7d7643975782cd9c43f0df9473f40117a5b8f91784462c444683aa180ff6decb677bbb1765bdbbd5ba69080fac806b4c7b97a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-BR/thunderbird-52.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d"; + sha512 = "ea4e6eae43d379e92adb54cf8a0e7cc1baf23bfb427e752f41d95bf9411dbf092ac94794aefbf2983dd7031db0961585c7bef31be63633035f907afb5a8f1a9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-PT/thunderbird-52.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d"; + sha512 = "0de5ad70739e456fdbceef8ba89445f37ca4be23a9b213ad5b52b92656b702dc7ab39d6b27f2d9012ee27c46a4749444a210070ced586963577ee386726ee72a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/rm/thunderbird-52.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e"; + sha512 = "dd947ad65fa23c42f2a1d118343b54deb2e7c9ef374118e2bfcbbec0d5ccfe5217ad0d636e9b4eee56f1e373beca52d8ff9f12593ce77b9f5aa94a1f62f2dcc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ro/thunderbird-52.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5"; + sha512 = "41b74b034f00a7ec26aabe5b5cca0b4a332b161be06f15a41e0c850ef53760ce1b284bcc8b71e1657a20b46c436c4ab6ef0bedb8f4a00c46b59bff825c5d5583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ru/thunderbird-52.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec"; + sha512 = "4bc1aee9cb629f59aba733a08d4c2f5951006e30ad38584688fce6772d19e2a01dc6ddb43b6c0d7375638c8e0714703e6e4cf47fc639c449a1ba02dabe7dc44f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/si/thunderbird-52.8.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54"; + sha512 = "663ab05d2e5f90f1be7fa9b2b61734f2c5c7d314ab86196629447c05d220f8de0a405d7ecb67e333d0c31006c0f0c384fa891fa087335f585a757b397d29769b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sk/thunderbird-52.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822"; + sha512 = "4e925c2ec5d218b82722d6141b4e7b9f3216ba35b5e8260cf15c58f647b60e93161e9bdc8501865567e693ccbe3b40458b69e85e7b7a0884a522a68cce2df123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sl/thunderbird-52.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f"; + sha512 = "9c0e33622d3cc6e735978b35643ae6c4028456964255b04aeee28486177e1711354cf1de02db84c6af928ba176578abf5b6a2a12a248389790fc6ade6fa96e2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sq/thunderbird-52.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb"; + sha512 = "a6642a2c55db02058ce8bb9111afa3a9433372494e1e613fd8f1d575c64ce95e0c0e61a8b9cd60c662266f3347cabfebfbc606bfa333a121396caf3c0f89737d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sr/thunderbird-52.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb"; + sha512 = "e472a07bf64547b912b80a32212fa9a0c25023044aff165cf92cad8af1796fbda9d36ef32f6c11bf9b87b75babb4c6fc6d9d5463b7b88f31649298adc6947b50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sv-SE/thunderbird-52.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68"; + sha512 = "18cc4af474e717dbec7ff88fffc6635b7fec7d8936f0c7d903c42a1b9482186d5d0a2ca661491f76b477c57de45e03c995c562e295e5fca574534d81d6e6d30b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ta-LK/thunderbird-52.8.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54"; + sha512 = "22f8d3345de9de5eae1cb05bbeaead160779b9f8c1187ace426d7ff026ec0ee0762a56b909f22c2bcdc186088b333d6fcf52a0ebf87ff56959b31b1f6dd7777a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/tr/thunderbird-52.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51"; + sha512 = "fc9365d3c869c1c3c1c9435f00b5f8eeee6fb231230a5fb0ff48cc59a8184f57bc558ab7f7386ebaee74b9c61c34bf5f7c6e882cd0e431749247b4a58d068c50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/uk/thunderbird-52.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016"; + sha512 = "60ed7415eb87d9f1eedc2c92078823dc49db80652f6ad26de0ceeef34b7c499ec940ac3bf083a7731bac9c144b6bc04546209aabd1ddc0b399ac174fb88be6e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/vi/thunderbird-52.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53"; + sha512 = "ea5892eb57fbdc0169f5dc39b2edb5eff2d06cddeae506e979d7556164fe55a65a402c7d791c873e6d0a3b48b97722d8dc90aae1b7389aaef3db836e803b9825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-CN/thunderbird-52.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159"; + sha512 = "22ab8baa3a41beda58f02612bcd5e0a9848c3cb93bc68037ea504cdd0b2a0b5ea5bf78e5bf735dcbad4079ebcb3c5434c34d6a5e2a9f09a513f91018084ce960"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-TW/thunderbird-52.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457"; + sha512 = "6c089225c57a0e010b0d413046004b53570afbf2d3b673dbca9a6e8cc102b6edf0e3a4f4858add4f5c1a4bb1fadc2641bd1c1dbc8659f970c84f61869b3634ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ar/thunderbird-52.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065"; + sha512 = "d48822233fa44e48b762e6aa2da302dafb38c32827b112197563952b35ee453a361a45eee35c6ee88317d6cc5215d0276e74862b167b01adf62f9c275f89a38b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ast/thunderbird-52.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd"; + sha512 = "3894ea6a01b335b92fa0d9f175aacefdf4fdcbfaeab3f3f5faa37f0bea090ebc7bfc130fb42ffff2293ecc95e3bdc8bf6142a5896dd4165fc3fa9f8e09fc3b5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/be/thunderbird-52.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb"; + sha512 = "ad93e61d4d1437681bdd772ad815efcb30716e716a08a442b9df2351b27118a590426d0ac054c6f41c29f4abd14f6e8fe7a54206eed810bddf1a70d6afa6776e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bg/thunderbird-52.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59"; + sha512 = "de09ff65e4c24aad1faded64897f9cf7bbdcc21d4ed609fa1bb0d9ad5d5a9d1d4e780fc2d8a386890e6cf59641697fd1542701689ba82e22c844ac29012633b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bn-BD/thunderbird-52.8.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704"; + sha512 = "a5f3737e2cdfa540adb3682542163a5f9c34605e975fd66bbb579c1508f485ff891f997a8c90d576fbc09d5c4cd183f123f020df7a3cd1f23401e7d92e930724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/br/thunderbird-52.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac"; + sha512 = "37222d22ed65271e08fbfd32d5e6fa7cfe65d5d002116bdfbde8fec9c3877bafff6b6ef38680cd4373a1c86ed92402aa5afd5bf04f369029669af5451c9d884c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ca/thunderbird-52.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33"; + sha512 = "87adf55bc6b50881b8d7ce30170f6e2f346db2c7f9801abbe37a17ef274417a3fb7dccab8d2eecb25d6c61a888ffede95c2ed40b6fe097fff2cf49a0e9490a00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cs/thunderbird-52.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8"; + sha512 = "055df8c29546975bfca186dfccfc9fde5ba418f3f2be1e15c77ac00c3b759527609427aa6590e3bb06e417211be6642bc37db4d19be6c3b866358d65c3aa3bbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cy/thunderbird-52.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb"; + sha512 = "c60e61146c3fc195c482106d40a2eac47d0b621a13bcaeee5fd95a40ffaa5ae810f58a5ba85b2676a4277ad3fc6d7caa3907b1d4962fd42887e762236e7e9366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/da/thunderbird-52.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441"; + sha512 = "1f8634f680512bf4ed0a44b41f3be55c118a114dcc262ee41010e58abc29f8bc3032a4c5264b948b9e4e13684d42761d97bf612050b891b4f52c78e91aa5a0c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/de/thunderbird-52.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105"; + sha512 = "9422296b970e77217581c0a10efb928923e55272baa485ccd1a7446d6e9a84da23e6f2b93623922ac85db84861ab4813282e328315bedf9e3b8cf344d869108e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/dsb/thunderbird-52.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013"; + sha512 = "281736767a8d59830b1452eff5e5058c4090661030068bdc33d2ceb960f10c38284c32ff94345685fa7a7781da502f67c34fc83314728161d75c5fb3fd0ad0b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/el/thunderbird-52.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5"; + sha512 = "baa144336339a3a271f5a852b3130d20054baab3633d453015a5862e630dd73f3a99f50b979da7910810e84e99120a2afa96f8dca8c8ce0017824851deb9d702"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-GB/thunderbird-52.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b"; + sha512 = "b9573d177ff237ad833e8064ac72f7560940c5accbb7b7f663f53f6942e0326ed451e2290b09003ef6b320b860cd388020b00cb340d39af34b38678556704390"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-US/thunderbird-52.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2"; + sha512 = "5f0d43831c256e00eb3cbe5953cae5b6e84f54bbbde8b71c83f841c38b3704620e1163bcc5cc903a0b716685371912401f90bd00f5500fd42cc6debe97b28470"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-AR/thunderbird-52.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4"; + sha512 = "ad640b2048f064d3e0914a0e79311e66c169258dd259a6873983147c37778616eecdc6e22aa64db272b534813a11fd1a0e5c555ca158d565513f3f201197a9a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-ES/thunderbird-52.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2"; + sha512 = "12c3f601473909f38f737a353dbda2bea515cec0e6934c389daeeb470a489104d8aa7f920b0d81f6da930f886ea74b0c82dc6a49a2142c1e843c458f597c1a5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/et/thunderbird-52.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb"; + sha512 = "840cee14b983e20a0aa6847e15aba2babdbba947b6df38c14d3d5f3b50dcdf6cddafec13191c75718634a15ec757ebeb664172d09f841fa2ee55db02bdc67cee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/eu/thunderbird-52.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21"; + sha512 = "d6b4c9edcc54f22f39991c206e7316ea172e4450fca39202a81cb522040abea08eb9b48e296baaa19aca12d34de0b8af8379c1faf30a1111648a1c0cee84ac70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fi/thunderbird-52.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200"; + sha512 = "23b25a0ab4879ddada9026991fb9955df9d32d635c4d0f746d329dcdfbce4593cbf7a3217845b8ef5f5a1b8e39a8a6bb1447557a5098f19acb82027e5993d549"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fr/thunderbird-52.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622"; + sha512 = "4033f784c31e8e13cfe408782e8b4e528f4d099abd02480090a28c6d0079a5bdd29ee0cd0953d5b94434c60d11c6b9867b355a8d8b6296ffee51d78337df3931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fy-NL/thunderbird-52.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e"; + sha512 = "64959a9a0d45564ff2ff344e1494c7f3d80792ecd8fd7df8f2ce3f35676533b033183f24ce44416f3cbd281dde20a7c7f2c3c488e8476d606d0416bdc341c02a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ga-IE/thunderbird-52.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109"; + sha512 = "255215853d3eccc809b71b653d6e830d1cc3e5857409f8d8f91b9f7a2d6e4cfb1033ba927e79a407f482ef8b56c1175d2b0162eb04a153cda8c2e156b0da8c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gd/thunderbird-52.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859"; + sha512 = "483550a103337dd7807b85ff87ce0fead21851ebba75a470be88796017bf412979be6020eb3daacb7bbc15044236093277b6b2dac1ac66fa2c3b2fc2e403911f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gl/thunderbird-52.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288"; + sha512 = "bbd79bf49e94720ffed29c07555488164de1188212fe4ae0e6076ede587997b3def662f880176e267d11c4ba1b1d4cdc6ed6721ee771a7cd9acabc3a231f76e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/he/thunderbird-52.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1"; + sha512 = "99b135b3f4aed9909daf8c2711ac10ad9ee85beecbc127e112fd61fb51a7d3d8f8575722cef0e7da6d4f79aa38de72ea4807c9503af5974c1ba9787180ec014f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hr/thunderbird-52.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965"; + sha512 = "a11ff16f2993d07d748630e94ec7bd6cd7634506535f3b7e7cfa5d16439fb6d2118ec195752cdedb87bfbee20feb629b72d6ce2f84b72a1da87b876e8e9786dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hsb/thunderbird-52.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7"; + sha512 = "9090e5766ca42f0a633a2e639a520cf6f89a0a08f9d81d7e35fdec64b9effaab8759fb7241ab77c4b31b217e5fd72d52fc953544dd55c3b141a9a6d2e631ca5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hu/thunderbird-52.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159"; + sha512 = "f5158c0d4ba87f2472fb07f850a709e174577293e431b482f0d67e3ecb16d818544a02e221d3b68dcbd1d8e750795d51254ad87eac98350f4919979651261e5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hy-AM/thunderbird-52.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4"; + sha512 = "c902f41fa9353e57c666876715da6175ee9bad96ed45e0e858b436fb5c10164038a56bea670fb73a8b0eb2a60ceed33a7c08e790718efe2e22e6883768b21529"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/id/thunderbird-52.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c"; + sha512 = "2366a3c32145012e073c84527f7e0f8cb1b311728b414084ee7b99727df5ea2ba6b6323def0c7fff2df20066f65ee530ed635a981e42bd1b7fe21874b893a680"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/is/thunderbird-52.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816"; + sha512 = "ae858675cac66dec80de439a2d9a1290ef2d6644a896b183692a10924eb55184b18866227787bae30cc01482453e65040618158a05c2f8d6d9dc2b7b60dca09b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/it/thunderbird-52.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb"; + sha512 = "ace77d1b7385f9aa825d5f67f640a77187891d5a257a00a4a9c565f46f742d931093a26f1d234f65f5e372d9598cb26c98766913e5b10a1c593fc6faab32edf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ja/thunderbird-52.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11"; + sha512 = "cb61fdcf68f4d02340a25c5b01b7037a7d102423bbd7068a9e7766f823a88ce461d52d6aca4211c1d871d31b8503477bd606c1f814c725f65240c260284e63f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/kab/thunderbird-52.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c"; + sha512 = "a52705049e4baef0e8f884f97fd3dc15097c855987e540adcca6b9d27d9d1a38538e326bf1f6bb2893055f72f3fdefe0563b6e048c02031af4e7e4bb77140698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ko/thunderbird-52.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76"; + sha512 = "a4bbe35e6a5fbf4db08982b0538390e3ec5e54d4e8b627a0e9267ae9137822710add418e5042ace3be8da3d5d56ea41ee4d5bbc5bfb95afe1587a5f81d5b32d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/lt/thunderbird-52.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4"; + sha512 = "0ef3fdb51246274198221cdbe07ebe6083c36759edd73243ed3568650b2d6570e90fc25b414d61d6a4bc0755b44eea21818cac09900c6eeef9dfcf24b403d3a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nb-NO/thunderbird-52.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a"; + sha512 = "4a08c425fc32dccd29901e7211b2e35dc151d954c1a6ec607ece3ffeedff1a913bef8910b46e4285edb785111643d6b1eeb19284af953e8446d92c055c62621a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nl/thunderbird-52.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230"; + sha512 = "8f54f5b2131bdd6579dcf7dce3afea57ac069206258ba52649d4f587aeed6e9aac9a08c4dc3920fd9be37074c2e619071bf502490b43d40a164d3f8d283de5f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nn-NO/thunderbird-52.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54"; + sha512 = "2d93dc0829669babf3ae3c3d6f16a7c9d2c9491c6127b1d7adc9b071cc6343e6383f0eed78bde342ce52d9570cc56b74595970e48430f08215143ed9642ad6cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pa-IN/thunderbird-52.8.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806"; + sha512 = "98a844a40538224f750934132deac0270fa401afac00cc19352798ba813249408f976809b261419d0b8613a4ebbaf7e8ed2b8669f0d3ffed63916b9e71f1b28d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pl/thunderbird-52.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6"; + sha512 = "8c7465446cd1cae4d1bbaae69541516765d9388c79e73bb64996fa0154802f5a20f86cd6c1d0f835f7f7b631455d0b5d1ccc1d0d6119705bc5a9f6f06ecce8de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-BR/thunderbird-52.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc"; + sha512 = "718b4af9ae8b205f1cdf666b68b851b7c0fd5f0152237f8933dc1ccc843265fe8a869c2656d044ce7b5ef857981c827fc6dee85ff1008921108313bbfe1266a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-PT/thunderbird-52.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40"; + sha512 = "3bf4ae15abfc39505f7f846e468baaa70b01e370a05258f31150e778ff67517098e27a9be135ead2f8f53ef96291d8d04a201d6aeb7d56a9e45e211f44246b21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/rm/thunderbird-52.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab"; + sha512 = "9214ecc41dd65de573cb21bb9ad56bc53baf8b86261ab41fdddca57173d157cb055f46aa2a087151c0a9b0dca4960914e7afc1095d118754f847dbc952a4a998"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ro/thunderbird-52.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa"; + sha512 = "aa46ef621604b95cb97b0e9cd4400a5f57aac58f82b3a5225a7828a757a24fa3e03d80839e1c6c03f914632fa6652386fc1787b8879343b06b6a59f9fe08b87c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ru/thunderbird-52.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3"; + sha512 = "f07d8fe2b6f81ebd151804d1c0f0a39851bf3ee1e468092a2b0eee5f69438a94872b467840da11aaa7fa5f5604dd86f28ee61c85fe62ae283f844f8aac4ced7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/si/thunderbird-52.8.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673"; + sha512 = "8f1b53473fb3e995c499e1583156114557548c1dc8a283a2e8f8c32a90cf2f765b3827455b1abb11272eae3dcd02d39e10b4eb4c2d6cd138f1905cf47bb8c696"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sk/thunderbird-52.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd"; + sha512 = "9d40559c28a79375bd70b382b959227be036b00115b8c331d1383eadcc4599099247d76a67880e284e8cf9137bed0271c8edc2b61059ae4d91a540de5f50bec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sl/thunderbird-52.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c"; + sha512 = "9426449a10bcc6ed3f24123fd5452cfcc87bead7014877a05be59d54db77af0833c15614c8c6e42f57005c9b773b1ebb2e59bcd9afd17177160b4010c0d5423a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sq/thunderbird-52.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24"; + sha512 = "a6d914e1df0b240afba8aa5467f5c1e62b48a263e86d32ab5b8e2cf07b8ad747ceeb733e9431f018779f4e1e9f6a9291f29f3e05681727a9b4981ad09a8cba45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sr/thunderbird-52.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25"; + sha512 = "f333626201a1445aebeef71926fe3d57f08fb0fbbeb2adf50b30fa75d3c28c4828489675e74a76fe07b0684e2ab949bc13b87ead003b54119efd11b1c7c11cc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sv-SE/thunderbird-52.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5"; + sha512 = "5fcc5b4210320f5d571938fddd312493615e829bd6415aeaca2c37ec63db46a1e2d8942e9ce58164c4b8d1d40e88eff0de43861f0e20d796129d9088e624a4ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ta-LK/thunderbird-52.8.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94"; + sha512 = "6f48b7b74a11e42fab58436112f8216942dc288e57594e4bd99d951efd8a4f4e2fee668425342635ce1fece60f0fb21027932b4e678a119f38ac45a6f7a89365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/tr/thunderbird-52.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680"; + sha512 = "c6a5c01c21e9b07fe1555c9f9148f888c793d4290d9b582cfd2741b895166a6b2407f0ff94de098f136758a816d59a1e6064f38c927574bc175afff168be72a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/uk/thunderbird-52.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7"; + sha512 = "6492260323d1e50a2bc129ba22008d3681283b2931bd6df0d5e5d9087a45294cffc74e711a40994d86d98c1d430f4349ffc4b97d0a1b539c35653c6ed6ea877b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/vi/thunderbird-52.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9"; + sha512 = "d43c675312a30a3e6c02f70e9af921025a6798bb5143864ef7d1bc44e11ad654be66a79590698faa44fd404a4090d6dde37088a26339f3c244e0f1cc4d9042f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-CN/thunderbird-52.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579"; + sha512 = "fe81ec132fbfd17a15f76299853c45306be9f801d2c03a10fa9e4b25ac48e6e14efe4bc4ff2e5f01a94e46b0c1752add48e5277b11dee7d52325bebf5126616f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-TW/thunderbird-52.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730"; + sha512 = "96b53b5287e3625b4045588118427fe696827aa25b790665aeacb9096ca9ee8bca8a67bd28f733d128d08541069a1e684819f4ce8a1fd29cf683bce546a04fd5"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 1bf37edf1af9fef556ddcb1924e485d7b607ba73..15d2c58e816c1892e444e65ed2060349ff58f2e5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.7.0"; + version = "52.8.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21"; + sha512 = "ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 5314d3668eb049dc93f8c1bcf7f350c33eee60da..a5eb9021048e49bdac0b8520866512857fdde21a 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchFromGitHub, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: -stdenv.mkDerivation rec { +let + serviceFile = fetchurl { + url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; + sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; + }; +in stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -19,6 +24,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip ''; + postInstall = '' + mkdir -p $out/etc + cp ndppd.conf-dist $out/etc/ndppd.conf + + mkdir -p $out/lib/systemd/system + # service file needed for our module is not in release yet + substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ + --replace /usr/sbin/ndppd $out/sbin/ndppd + ''; + meta = { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = https://github.com/DanielAdolfsson/ndppd; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index fe58b1d3e28a404b73cd16ec78b11d893a9bff18..421a3cfbe3b784e712760dc0e479b4ac5cdac100 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub }: +{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "netperf-2.7.0"; + name = "netperf-20180504"; src = fetchFromGitHub { owner = "HewlettPackard"; repo = "netperf"; - rev = name; - sha256 = "034indn3hicwbvyzgw9f32bv2i7c5iv8b4a11imyn03pw97jzh10"; + rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab"; + sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2"; }; + buildInputs = [ libsmbios ]; + nativeBuildInputs = [ autoreconfHook ]; + autoreconfPhase = '' + autoreconf -i -I src/missing/m4 + ''; + configureFlags = [ "--enable-demo" ]; + enableParallelBuilding = true; + meta = { description = "Benchmark to measure the performance of many different types of networking"; homepage = http://www.netperf.org/netperf/; license = "Hewlett-Packard BSD-like license"; platforms = stdenv.lib.platforms.linux; - maintainers = []; + maintainers = [ stdenv.lib.maintainers.mmlb ]; }; } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 0b8a584fc6a623426477d9b3c043543516a72042..74d59c05ec91f2003d8e5b2eb0577f88af02449c 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.2"; + version = "1.12.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15"; + sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 94e3b7d0ba6a40b31deace7a109764ef6c1fa1df..17c5cc86fa6b441dc589ccebe690ec1616b46fe8 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "owncloud-client-${version}"; - version = "2.3.4"; + version = "2.4.1"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49"; + sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23"; }; - patches = [ ../nextcloud-client/find-sql.patch ]; + patches = [ ./find-sql.patch ]; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtwebkit qtkeychain sqlite ]; diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch new file mode 100644 index 0000000000000000000000000000000000000000..44dea6414e9298bccdfd736413def08526409f20 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/find-sql.patch @@ -0,0 +1,12 @@ +*** a/cmake/modules/QtVersionAbstraction.cmake +--- b/cmake/modules/QtVersionAbstraction.cmake +*************** +*** 8,13 **** +--- 8,14 ---- + find_package(Qt5Core REQUIRED) + find_package(Qt5Network REQUIRED) + find_package(Qt5Xml REQUIRED) ++ find_package(Qt5Sql REQUIRED) + find_package(Qt5Concurrent REQUIRED) + if(UNIT_TESTING) + find_package(Qt5Test REQUIRED) diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix deleted file mode 100644 index 688bb11acd035acaf84367d279ccc6590591f38b..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, libunistring, libidn -, makeWrapper, autoconf, automake -, withVerbose ? false }: - -let - rev = "27840"; -in -stdenv.mkDerivation rec { - name = "gnunet-svn-${rev}"; - - src = fetchsvn { - url = https://gnunet.org/svn/gnunet; - inherit rev; - sha256 = "0zhxvvj5rbhca2ykfx3g93dv94xyhqsnj011a6gql7zd5vfhaf6v"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses libidn - pkgconfig gettext libunistring makeWrapper - autoconf automake - ]; - - configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l '\' {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - sed -i "$i" -e's/\/127.0.0.1/g' - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - patchShebangs src/gns/nss/install-nss-plugin.sh - - sh contrib/pogen.sh - sh bootstrap - ''; - - doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ - - meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = https://gnunet.org/; - - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 90d68a96e5c0324a784df93d66a9beda399d38ff..b2e9333beb3eed5e7b3489846bc4b01fd2226255 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk"; + sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index d5982f33e78e7f3c34b6a0516c4012bf9b63c28e..e1fee1bd78b683245b92ce3ee90f17b4e67a35c0 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -91,6 +91,17 @@ let x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; x64suffix = "102"; x86suffix = "102"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh* + }; + + "13.9.1" = { + major = "13"; + minor = "9"; + patch = "1"; + x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC"; + x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483"; + x64suffix = "6"; + x86suffix = "6"; homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; }; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 904a6812c489eb0041ccbc5761f2d7164a7530b2..a4d2e85a91198d857f5be69c448540d4de503c27 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }: +{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, +makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.1.0.0"; + version = "4.1.1.1"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab"; + sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; }; - buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ]; + buildInputs = [ cups libssh libXpm nxproxy openldap openssh + qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; patchPhase = '' substituteInPlace Makefile \ - --replace "lrelease-qt4" "${qt4}/bin/lrelease" \ - --replace "qmake-qt4" "${qt4}/bin/qmake" \ + --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ + --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ + --replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \ --replace "-o root -g root" "" ''; - makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; + makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 35926836e30d84eba11e8262afc8a62b074cde33..279dc508225b0b3093156ec58d328a93c7ee915f 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.1.7"; + version = "6.1.8"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq"; + sha256 = "0gy7jfxr5f8qvbqj80g7fzaw9b3vax750c4z5cr7f43rv99284pc"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d8ff5f3100acbcdcd98b759c1a9cb1401eab7adc..8c745a4aa3f8e8585ea22d684b9ba7e9bbbb1825 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -82,6 +82,11 @@ in stdenv.mkDerivation { enableParallelBuilding = true; + shellHook = '' + # to be able to run the resulting binary + export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 + ''; + meta = with stdenv.lib; { homepage = https://www.wireshark.org/; description = "Powerful network protocol analyzer"; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index b1e2258271bf0f2a623c9a5eb4a2cf1fda006cc8..d1b333587a6875e386e27401f1084cf1e6424363 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.6.6"; + version = "1.7.0"; src = fetchurl { url = "http://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z"; + sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix new file mode 100644 index 0000000000000000000000000000000000000000..252c6d878d0c6465171fdd87077624f84e966727 --- /dev/null +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -0,0 +1,85 @@ +{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx +, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui +, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade +, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +}: + +/* If you experience GConf errors when running GnuCash on NixOS, see + * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications + * for a possible solution. + */ + +stdenv.mkDerivation rec { + name = "gnucash-2.4.15"; + + src = fetchurl { + url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; + sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml + libgnomeprint goffice enchant gettext intltool perl guile slibGuile + swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl + perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + ]; + propagatedUserEnvPkgs = [ gconf ]; + + configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + + postInstall = '' + # Auto-updaters don't make sense in Nix. + rm $out/bin/gnc-fq-update + + sed -i $out/bin/update-gnucash-gconf \ + -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' + + for prog in $(echo "$out/bin/"*) + do + # Don't wrap the gnc-fq-* scripts, since gnucash calls them as + # "perl