diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index fb6753f79a50..c25fd1b21510 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -4,6 +4,7 @@ , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 +, qtmacextras , monero, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.6"; + version = "0.17.1.7"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; + sha256 = "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4"; }; nativeBuildInputs = [ @@ -49,7 +50,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] + ++ optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -105,7 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; - badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 51dedba969bd..3a254053714f 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.6"; + version = "0.17.1.7"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"; + sha256 = "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 6e7c2307d642..fd89f3160084 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -52,19 +52,18 @@ let ungoogled-chromium = callPackage ./ungoogled.nix {}; }; - pkgSuffix = if channel == "dev" then "unstable" else channel; + pkgSuffix = if channel == "dev" then "unstable" else + (if channel == "ungoogled-chromium" then "stable" else channel); pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = if channel == "ungoogled-chromium" - then throw "Google Chrome is not supported for the ungoogled-chromium channel." - else fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - sha256 = chromium.upstream-info.sha256bin64; - }; + chromeSrc = fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + sha256 = chromium.upstream-info.sha256bin64; + }; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; widevineCdm = stdenv.mkDerivation { @@ -76,7 +75,7 @@ let unpackCmd = let widevineCdmPath = - if channel == "stable" then + if (channel == "stable" || channel == "ungoogled-chromium") then "./opt/google/chrome/WidevineCdm" else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index b4d16fa149fb..2b9f9232c24d 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -91,24 +91,15 @@ def get_latest_ungoogled_chromium_tag(): return tag_data[0]['name'] -def get_ungoogled_chromium_channel(): - """Returns a dictionary for the ungoogled-chromium channel.""" - latest_tag = get_latest_ungoogled_chromium_tag() - version = latest_tag.split('-')[0] - if version == last_channels['ungoogled-chromium']['version']: - # No update available -> keep the cached information (no refetching required): - return last_channels['ungoogled-chromium'] - channel = { +def get_latest_ungoogled_chromium_build(): + """Returns a dictionary for the latest ungoogled-chromium build.""" + tag = get_latest_ungoogled_chromium_tag() + version = tag.split('-')[0] + return { + 'channel': 'ungoogled-chromium', 'version': version, - 'sha256': nix_prefetch_url(f'{BUCKET_URL}/chromium-{version}.tar.xz'), - 'deps': get_channel_dependencies(version) + 'ungoogled_tag': tag } - repo_url = 'https://github.com/Eloston/ungoogled-chromium.git' - channel['deps']['ungoogled-patches'] = { - 'rev': latest_tag, - 'sha256': nix_prefetch_git(repo_url, latest_tag)['sha256'] - } - return channel channels = {} @@ -118,6 +109,8 @@ last_channels = load_json(JSON_PATH) print(f'GET {HISTORY_URL}', file=sys.stderr) with urlopen(HISTORY_URL) as resp: builds = csv.DictReader(iterdecode(resp, 'utf-8')) + builds = list(builds) + builds.append(get_latest_ungoogled_chromium_build()) for build in builds: channel_name = build['channel'] @@ -134,13 +127,18 @@ with urlopen(HISTORY_URL) as resp: continue channel = {'version': build['version']} - suffix = 'unstable' if channel_name == 'dev' else channel_name + if channel_name == 'dev': + google_chrome_suffix = 'unstable' + elif channel_name == 'ungoogled-chromium': + google_chrome_suffix = 'stable' + else: + google_chrome_suffix = channel_name try: channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') channel['sha256bin64'] = nix_prefetch_url( - f'{DEB_URL}/google-chrome-{suffix}/' + - f'google-chrome-{suffix}_{build["version"]}-1_amd64.deb') + f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + + f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') except subprocess.CalledProcessError: # This build isn't actually available yet. Continue to # the next one. @@ -149,6 +147,12 @@ with urlopen(HISTORY_URL) as resp: channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': channel['chromedriver'] = get_matching_chromedriver(channel['version']) + elif channel_name == 'ungoogled-chromium': + ungoogled_repo_url = 'https://github.com/Eloston/ungoogled-chromium.git' + channel['deps']['ungoogled-patches'] = { + 'rev': build['ungoogled_tag'], + 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] + } channels[channel_name] = channel @@ -167,8 +171,6 @@ with open(JSON_PATH, 'w') as out: return 3 print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) sys.exit(1) - # Get the special ungoogled-chromium channel: - channels['ungoogled-chromium'] = get_ungoogled_chromium_channel() sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) json.dump(sorted_channels, out, indent=2) out.write('\n') diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2cd673e9c550..5be89852b389 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -46,6 +46,7 @@ "ungoogled-chromium": { "version": "87.0.4280.88", "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", + "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", "deps": { "gn": { "version": "2020-09-09", diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix new file mode 100644 index 000000000000..4b0b62400193 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -0,0 +1,7 @@ +{ callPackage, buildGoPackage }: + +callPackage ./generic.nix { + inherit buildGoPackage; + version = "1.0.1"; + sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv"; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index dac3c54a16a6..3fb8b2f35e8d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.7"; + version = "2.15.9"; src = fetchPypi { inherit pname version; - sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr"; + sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 2cbf1c506321..2a75c6c2030a 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1lm7ws7in8cjjl38c7xw67jr42d717kk5kkfac7rprk0z7pb104l"; + sha256 = "1pwbmw20kzlxnwln92nxq7f5s1xwbpv6j7il7jxymlw0y31rl281"; }; nativeBuildInputs = [ @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons cp -a Luna* $out/share/icons + # remove files with spaces in the name, otherwise + # gtk-update-icon-cache fails with the message "The generated cache + # was invalid" + # https://github.com/darkomarko42/Luna-Icons/issues/2 + rm "$out/share/icons/Luna/scalable/apps/yast-checkmedia (copia).svg" + for theme in $out/share/icons/*; do gtk-update-icon-cache "$theme" done diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index a3cd4d5ec4d8..9ce859c9b760 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "87dc2a3183c1d4595990203e752b430155d7582a60850dfe0756189a233d4b57"; + sha256 = "b0561dbdfecc6a6d7b0cc226d75a800ae9bbc93313a6ad526a1adc97be51eada"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 5853538610a1..1a01eda244b0 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.13"; + version = "2.1.14"; src = fetchPypi { inherit pname version; - sha256 = "4f1f6fa19893048bf6b950eb7eb2d4cdfeb8b940a9defaca5d4f79e5acd5085f"; + sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 9641ee9d12ce..188e66b5c7a8 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "requests-hawk"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1qcga289yr6qlkmc6fjk0ia6l5cg0galklpdzpslf1y8ky9zb7rl"; + sha256 = "1a5e61cab14627f1b5ba7de0e3fb2b681007ff7b2a49110d504e5cd6d7fd62d6"; }; propagatedBuildInputs = [ mohawk requests ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index ef595ae93fac..79c5cf25e303 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.0"; + version = "3.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a158265fde85a6757b7f09b568b1f7d6eaf75eaae208be27336f09dc048e5bcf"; + sha256 = "53950eb89f77066d6caf553c52ec01701a8bebbaffa9e0a627df3f229ca8720f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 244444a276f5..7c8bb17b8b70 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tlslite-ng"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "1aw7j50byzab0xwp50m5w5c14fzdzwk2law5a5bn6dn3i5fc6fw2"; + sha256 = "6ab56f0e9629ce3d807eb528c9112defa9f2e00af2b2961254e8429ca5c1ff00"; }; buildInputs = [ ecdsa ]; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index eddd6ac4fd18..f1767862ad32 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "toposort"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "dba5ae845296e3bf37b042c640870ffebcdeb8cd4df45adaa01d8c5476c557dd"; + sha256 = "a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 770407736a06..8118c0f9497f 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.5.0"; + version = "0.5.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1qc3389i2y16n1hjg4dzk821klzjipbh9c9yci70z51pp21mwwh5"; + sha256 = "03k9dndnv3p3ysfq5wq8bnaijvqip61fh79d5gz2zk284vc47mgj"; extension = "zip"; }; diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix new file mode 100644 index 000000000000..98a24ca5ebe4 --- /dev/null +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "docopts"; + version = "0.6.3-rc2"; + + src = fetchFromGitHub { + owner = "docopt"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PmsTkPT/sf70MKYLhHvjCDb2o3VQ1k7d++RUW7rcoAg="; + }; + + goPackagePath = "github.com/docopt/${pname}"; + + goDeps = ./deps.nix; + + subPackages = [ "./" ]; + + postInstall = '' + install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/docopt/${pname}"; + description = "docopt CLI tool for shell scripting"; + license = licenses.mit; + maintainers = [ maintainers.confus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/docopts/deps.nix b/pkgs/development/tools/misc/docopts/deps.nix new file mode 100644 index 000000000000..8cc1686de7d6 --- /dev/null +++ b/pkgs/development/tools/misc/docopts/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt.go"; + rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; # "0.6.2"; + sha256 = "sha256-0mCKIC5x7aauBL8ahXB9ExMfoTJl55HaafWWWPNRmUI="; + }; + } +] diff --git a/pkgs/games/manaplus/default.nix b/pkgs/games/manaplus/default.nix new file mode 100644 index 000000000000..ff7bfae971a0 --- /dev/null +++ b/pkgs/games/manaplus/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchurl, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer +, SDL2_net , SDL2_gfx, zlib, physfs, curl, libxml2, libpng, pkg-config +, libGL, autoreconfHook }: +stdenv.mkDerivation rec { + pname = "manaplus"; + version = "1.9.3.23"; + + src = fetchurl { + url = "https://download.evolonline.org/manaplus/download/${version}/manaplus-${version}.tar.xz"; + sha256 = "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz"; + }; + + nativeBuildInputs = [ + autoreconfHook pkg-config + ]; + + buildInputs = [ + SDL2 SDL2_image SDL2_ttf SDL2_mixer SDL2_net SDL2_gfx zlib + physfs curl libxml2 libpng libGL + ]; + + configureFlags = [ "--with-sdl2" "--without-dyecmd" ]; + + enableParallelBuilding = true; + + meta = { + maintainers = [ lib.maintainers.lheckemann ]; + description = "A free OpenSource 2D MMORPG client"; + homepage = "https://manaplus.org/"; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 81dcb5d4563b..dd9ce3e080a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,14 +1,14 @@ { stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.8.0-2020.09.07"; - modDirVersion = "5.8.0"; + version = "5.9.0-2020.11.20"; + modDirVersion = "5.9.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs"; - rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; - sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; + rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc"; + sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4e87a68866ce..6c105cf9b335 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -31,14 +31,14 @@ in buildPythonApplication rec { pname = "lexicon"; - version = "3.4.3"; + version = "3.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1ym4gj4xyd69rsc5niilvcb72gys22rjxhj4qd574vyx3ryl34za"; + sha256 = "1jsc2ybbf3mbvgzkgliria494dpj23mgqnw2lh43cnd9rgsjvzn3"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ee2af363a566..5b2a4e322421 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -6,13 +6,13 @@ assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-08-25"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; - sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; + rev = "41bec63b265a38dd9fa168b6042ea5bf07135048"; + sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj"; }; postPatch = '' @@ -22,11 +22,7 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkgconfig - ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio @@ -34,22 +30,14 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder - - checkFlags = [ - "BCACHEFS_TEST_USE_VALGRIND=no" - ]; - - checkInputs = [ - valgrind - ]; + checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; + checkInputs = [ valgrind ]; preCheck = stdenv.lib.optionalString fuseSupport '' rm tests/test_fuse.py ''; - installFlags = [ - "PREFIX=${placeholder "out"}" - ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 048c5166d6a3..776823a6a280 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.4p1"; + version = "1.9.4p2"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "EXIJnfzdL6SX4To8J0qfWSCr02rn0veqrNa8a8kv1nc="; + sha256 = "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"; }; prePatch = '' diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 438681e1728f..390793ffaf1c 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -1,16 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, git }: buildGoModule rec { pname = "chroma"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "alecthomas"; - repo = "chroma"; + repo = pname; rev = "v${version}"; - sha256 = "1gwwfn26aipzzvyy466gi6r54ypfy3ylnbi8c4xwch9pkgw16w98"; + sha256 = "0vzxd0jvjaakwjvkkkjppakjb00z44k7gb5ng1i4924agh24n5ka"; + leaveDotGit = true; + fetchSubmodules = true; }; + nativeBuildInputs = [ git ]; + + # populate values otherwise taken care of by goreleaser + # https://github.com/alecthomas/chroma/issues/435 + postPatch = '' + commit="$(git rev-parse HEAD)" + date=$(git show -s --format=%aI "$commit") + + substituteInPlace cmd/chroma/main.go \ + --replace 'version = "?"' 'version = "${version}"' \ + --replace 'commit = "?"' "commit = \"$commit\"" \ + --replace 'date = "?"' "date = \"$date\"" + ''; + vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; subPackages = [ "cmd/chroma" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac65a3d85d5e..f8f920cc35e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6054,6 +6054,9 @@ in nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; }; + nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { + buildGoPackage = buildGo115Package; + }; notable = callPackage ../applications/misc/notable { }; @@ -12740,6 +12743,8 @@ in docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; + docopts = callPackage ../development/tools/misc/docopts { }; + dotconf = callPackage ../development/libraries/dotconf { }; draco = callPackage ../development/libraries/draco { }; @@ -25866,6 +25871,8 @@ in mari0 = callPackage ../games/mari0 { }; + manaplus = callPackage ../games/manaplus { }; + mars = callPackage ../games/mars { }; megaglest = callPackage ../games/megaglest {};