Commit 62efcd7a authored by sternenseemann's avatar sternenseemann
Browse files

Merge remote-tracking branch 'origin/master' into haskell-updates

parents f5b1e933 7e1cf498

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

+7 −0
Original line number Diff line number Diff line
@@ -517,6 +517,13 @@ 
          <literal>libax25</literal> package.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>nixos-version</literal> now accepts

          <literal>--configuration-revision</literal> to display more

          information about the current generation revision

        </para>

      </listitem>

    </itemizedlist>

  </section>

</section>

nixos/doc/manual/man-nixos-version.xml

+21 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
    <option>--revision</option>

   </arg>



   <arg>

    <option>--configuration-revision</option>

   </arg>



   <arg>

    <option>--json</option>

   </arg>
@@ -118,6 +122,23 @@ 
    </listitem>

   </varlistentry>



   <varlistentry>

    <term>

     <option>--configuration-revision</option>

    </term>

    <listitem>

     <para>

      Show the configuration revision if available. This could be the full SHA1

      hash of the Git commit of the system flake, if you add

      <screen>{ system.configurationRevision = self.rev or "dirty"; }</screen>

      to the <screen>modules</screen> array of your flake.nix system configuration e.g.

<screen><prompt>$ </prompt>nixos-version --configuration-revision

aa314ebd1592f6cdd53cb5bba8bcae97d9323de8

</screen>

     </para>

    </listitem>

   </varlistentry>



   <varlistentry>

    <term>

     <option>--json</option>

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -136,3 +136,5 @@ In addition to numerous new and upgraded packages, this release has the followin 
- The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.



- [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package.



- `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision

nixos/modules/installer/tools/nixos-version.sh

+8 −1
Original line number Diff line number Diff line
@@ -8,11 +8,18 @@ case "$1" in 
    ;;

  --hash|--revision)

    if ! [[ @revision@ =~ ^[0-9a-f]+$ ]]; then

      echo "$0: Nixpkgs commit hash is unknown"

      echo "$0: Nixpkgs commit hash is unknown" >&2

      exit 1

    fi

    echo "@revision@"

    ;;

  --configuration-revision)

    if [[ "@configurationRevision@" =~ "@" ]]; then

      echo "$0: configuration revision is unknown" >&2

      exit 1

    fi

    echo "@configurationRevision@"

    ;;

  --json)

    cat <<EOF

@json@

pkgs/applications/blockchains/namecoin/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 


stdenv.mkDerivation rec {

  pname = "namecoin" + lib.optionalString (!withGui) "d";

  version = "23.0";

  version = "24.0";



  src = fetchFromGitHub {

    owner = "namecoin";

    repo = "namecoin-core";

    rev = "nc${version}";

    sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A=";

    sha256 = "sha256-DSUYqNHgPsHVwx3G83pZdzsTjhX2X2mMqt+lAlIuGp0=";

  };



  nativeBuildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec { 
    description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";

    homepage = "https://namecoin.org";

    license = licenses.mit;

    maintainers = with maintainers; [ infinisil ];

    maintainers = with maintainers; [ ];

    platforms = platforms.linux;

  };

}