nixpkgs/pkgs
Robert Hensing 0e5cfdb8c5 Partially revert "various: cleanup of 'inherit version;'"
I forgot to unresolve a conversation, causing the PR to be merged
prematurely by someone else.

This partially reverts commit 1e9baed56b.
2021-07-17 22:39:28 +02:00
..
applications 1password-gui: 8.0.34 - 8.1.1 (#130270) 2021-07-17 22:26:45 +02:00
build-support Merge pull request #130040 from Atemu/nix-prefetch-git-shallow-hash 2021-07-17 14:29:01 +01:00
common-updater
data Merge master into haskell-updates 2021-07-16 00:05:27 +00:00
desktops pantheon.elementary-mail: unstable-2021-06-21 -> 6.0.0 2021-07-17 11:10:24 +08:00
development Merge pull request #130477 from SuperSandro2000/gnumake 2021-07-17 22:23:32 +02:00
games steamPackages.steam-fhsenv: fix Proton 2021-07-16 15:13:31 -07:00
misc vimPlugins.neovim-ayu: init at 2021-07-13 2021-07-17 11:32:10 -07:00
os-specific Merge pull request #130416 from marsam/update-lxc 2021-07-17 14:10:27 +01:00
pkgs-lib
servers Merge pull request #130435 from LeSuisse/openresty-1.19.3.2 2021-07-17 14:03:53 +02:00
shells Partially revert "various: cleanup of 'inherit version;'" 2021-07-17 22:39:28 +02:00
stdenv Merge pull request #129328 from nh2/manual-fix-hardening-flags-sections 2021-07-05 23:11:22 +02:00
test Merge pull request #130041 from xworld21/texlive-generate-fmtutilcnf 2021-07-17 08:21:12 -04:00
tools Merge pull request #130451 from applePrincess/cloudmonkey-6 2021-07-17 22:35:15 +02:00
top-level Merge pull request #130454 from prusnak/blocksat-cli 2021-07-18 02:18:06 +07:00