···6161<listitem>
6262<para>Format the commit in a following way:</para>
6363<programlisting>
6464-(pkg-name | service-name): (from -> to | init at version | refactor | etc)
6464+(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
6565Additional information.
6666</programlisting>
6767···84848585<listitem>
8686<para>
8787-<command>hydra service: add bazBaz option</command>
8787+<command>nixos/hydra: add bazBaz option</command>
8888</para>
8989</listitem>
90909191<listitem>
9292<para>
9393-<command>nginx service: refactor config generation</command>
9393+<command>nixos/nginx: refactor config generation</command>
9494</para>
9595</listitem>
9696</itemizedlist>
···196196197197<itemizedlist>
198198<listitem>
199199-<para>Write the title in format <command>(pkg-name | service): improvement</command>.
199199+<para>Write the title in format <command>(pkg-name | nixos/<module>): improvement</command>.
200200201201<itemizedlist>
202202<listitem>
···2828 else if final.isLinux then "glibc"
2929 # TODO(@Ericson2314) think more about other operating systems
3030 else "native/impure";
3131+ extensions = {
3232+ sharedLibrary =
3333+ /**/ if final.isDarwin then ".dylib"
3434+ else if final.isWindows then ".dll"
3535+ else ".so";
3636+ executable =
3737+ /**/ if final.isWindows then ".exe"
3838+ else "";
3939+ };
3140 } // mapAttrs (n: v: v final.parsed) inspect.predicates
3241 // args;
3342 in final;
···11-{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }:
11+{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }:
2233stdenv.mkDerivation rec {
44 name = "avrdudess-2.2.20140102";
···2323 export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
2424 # We need PATH from user env for xdg-open to find its tools, which
2525 # typically depend on the currently running desktop environment.
2626- export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
2626+ export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH"
27272828 # avrdudess must have its resource files in its current working directory
2929 cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
···8899let
1010 mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
1111- soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
1211 # `tar -z` requires gzip on $PATH, so wrap tar.
1312 # At some point, we should try to patch mesos so we add gzip to the PATH when
1413 # tar is invoked. I think that only needs to be done here:
···193192 mkdir -p $out/share/java
194193 cp src/java/target/mesos-*.jar $out/share/java
195194196196- MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext}
195195+ MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary}
197196198197 mkdir -p $out/nix-support
199198 touch $out/nix-support/setup-hook
···11-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.37/ -A '*.tar.xz' )
11+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.38/ -A '*.tar.xz' )
···11+{ stdenv, fetchurl, avrgcc, avrbinutils, automake, autoconf }:
22+33+let
44+ version = "2.0.0";
55+in
66+stdenv.mkDerivation {
77+ name = "avr-libc-${version}";
88+99+ src = fetchurl {
1010+ url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
1111+ sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
1212+ };
1313+1414+ buildInputs = [ avrgcc avrbinutils automake autoconf ];
1515+ configurePhase = ''
1616+ unset LD
1717+ unset AS
1818+ unset AR
1919+ unset CC
2020+ unset CXX
2121+ unset RANLIB
2222+ unset STRIP
2323+2424+ ./configure --prefix=$out --build=$(./config.guess) --host=avr
2525+ '';
2626+2727+ # Make sure we don't strip the libraries in lib/gcc/avr.
2828+ stripDebugList= "bin";
2929+ dontPatchELF = true;
3030+3131+ meta = with stdenv.lib; {
3232+ description = "a C runtime library for AVR microcontrollers";
3333+ homepage = http://savannah.nongnu.org/projects/avr-libc/;
3434+ license = licenses.bsd3;
3535+ platforms = platforms.unix;
3636+ maintainers = with maintainers; [ mguentner ];
3737+ };
3838+}
+1-1
pkgs/development/node-packages/README.md
···55 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
66 or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
77 for packagages depending on Node.js 4.x)
88- 2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`.
88+ 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
99 3. Build your new package to test your changes:
1010 `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
1111 To build against a specific Node.js version (e.g. 4.x):
···2828 meta = with stdenv.lib; {
2929 description = "Backports of new features in Python’s weakref module";
3030 license = licenses.psfl;
3131- maintainers = with maintainers; [ jpbernardy ];
3131+ maintainers = with maintainers; [ jyp ];
3232 };
3333}